webgui: add -Dcefweb=ON|OFF -Dqt5web=ON|OFF switches

By default OFF, should be enabled only when appropriate software is
installed on the system

config/RConfigure.in

@@ -40,8 +40,8 @@
 #@hasllvm@ R__EXTERN_LLVMDIR @llvmdir@
 #@useimt@ R__USE_IMT   /**/
 #@memory_term@ R__COMPLETE_MEM_TERMINATION /**/
-#@hascefweb@ R__HAS_CEF  /**/
-#@hasqt5webengine@ R__HAS_QT5WEBENGINE  /**/
+#@hascefweb@ R__HAS_CEFWEB  /**/
+#@hasqt5webengine@ R__HAS_QT5WEB  /**/
 
 #if defined(R__HAS_VECCORE) && defined(R__HAS_VC)
 #ifndef VECCORE_ENABLE_VC

gui/CMakeLists.txt

@@ -7,8 +7,12 @@ add_subdirectory(recorder)
 add_subdirectory(sessionviewer)
 if(root7)
   add_subdirectory(webdisplay)
+  if(cefweb)
   add_subdirectory(cefdisplay)
+  endif()
+  if(qt5web)
   add_subdirectory(qt5webdisplay)
+  endif()
   add_subdirectory(canvaspainter)
 endif()
 if(qtgsi)

gui/cefdisplay/CMakeLists.txt

 ############################################################################
-# CMakeLists.txt file for building ROOT gui/canvaspainter package
+# CMakeLists.txt file for building ROOT gui/cefdisplay package
 ############################################################################
 
-if(DEFINED ENV{CEF_PATH})
-if(EXISTS $ENV{CEF_PATH})
-
 set(libname ROOTCefDisplay)
 
-set(cefweb ON)
-
 ROOT_GLOB_SOURCES(CEF_sources src/simple_app.cxx src/base_handler.cxx src/osr_handler.cxx src/gui_handler.cxx)
 
 if(ROOT_ARCHITECTURE MATCHES macosx)
@@ -46,6 +41,3 @@ ROOT_LINKER_LIBRARY(${libname} $<TARGET_OBJECTS:ROOTCefDisplayObjs>
 # ROOT_INSTALL_HEADERS()
 
 ROOT_EXECUTABLE(cef_main ${CEF_MAIN} LIBRARIES ${CEF_LIBRARY} ${CEF_DLL_WRAPPER})
-
-endif()
-endif()

gui/qt5webdisplay/CMakeLists.txt

@@ -10,20 +10,14 @@ find_package(Qt5WebEngine)
 
 find_package(Qt5WebEngineWidgets)
 
-if(Qt5WebEngineWidgets_FOUND)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-   set(qt5web ON)
+include_directories(${Qt5WebEngine_INCLUDE_DIRS})
+include_directories(${Qt5WebEngineWidgets_INCLUDE_DIRS})
 
-   set(CMAKE_AUTOMOC ON)
-   set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ROOT_OBJECT_LIBRARY(RootQt5WebObjs rootwebview.cpp rootwebpage.cpp rooturlschemehandler.cpp rootqt5.cpp)
 
-   include_directories(${Qt5WebEngine_INCLUDE_DIRS})
-   include_directories(${Qt5WebEngineWidgets_INCLUDE_DIRS})
-
-   ROOT_OBJECT_LIBRARY(RootQt5WebObjs rootwebview.cpp rootwebpage.cpp rooturlschemehandler.cpp rootqt5.cpp)
-
-   ROOT_LINKER_LIBRARY(${libname} $<TARGET_OBJECTS:RootQt5WebObjs>
-                       LIBRARIES Qt5::WebEngine Qt5::WebEngineWidgets
-                       DEPENDENCIES Core RHTTP)
-
-endif()
\ No newline at end of file
+ROOT_LINKER_LIBRARY(${libname} $<TARGET_OBJECTS:RootQt5WebObjs>
+                    LIBRARIES Qt5::WebEngine Qt5::WebEngineWidgets
+                    DEPENDENCIES Core RHTTP)