[CMake] Make Proof optional

CMakeLists.txt

@@ -278,7 +278,9 @@ add_subdirectory (net)
 add_subdirectory (graf2d)
 add_subdirectory (graf3d)
 add_subdirectory (gui)
-add_subdirectory (proof)
+if(proof)
+  add_subdirectory (proof)
+endif()
 add_subdirectory (html)
 add_subdirectory (montecarlo)
 add_subdirectory (geom)

cmake/modules/RootBuildOptions.cmake

@@ -126,6 +126,7 @@ ROOT_BUILD_OPTION(macos_native OFF "Disable looking for libraries, includes and
 ROOT_BUILD_OPTION(mathmore ON "Build libMathMore extended math library (requires GSL)")
 ROOT_BUILD_OPTION(memory_termination OFF "Free internal ROOT memory before process termination (experimental, used for leak checking)")
 ROOT_BUILD_OPTION(memstat OFF "Build memory statistics utility (helps to detect memory leaks)")
+ROOT_BUILD_OPTION(mlp ON "Enable support for TMultilayerPerceptron classes' federation")
 ROOT_BUILD_OPTION(minuit2 OFF "Build Minuit2 minimization library")
 ROOT_BUILD_OPTION(monalisa OFF "Enable support for monitoring with Monalisa (requires libapmoncpp)")
 ROOT_BUILD_OPTION(mysql ON "Enable support for MySQL databases")
@@ -134,6 +135,7 @@ ROOT_BUILD_OPTION(opengl ON "Enable support for OpenGL (requires libGL and libGL
 ROOT_BUILD_OPTION(oracle ON "Enable support for Oracle databases (requires Oracle Instant Client)")
 ROOT_BUILD_OPTION(pch ON "Enable support for Pre-Compiled Headers (PCH)")
 ROOT_BUILD_OPTION(pgsql ON "Enable support for PostgreSQL")
+ROOT_BUILD_OPTION(proof ON "Enable support for Proof")
 ROOT_BUILD_OPTION(pyroot_experimental OFF "Use experimental Python bindings for ROOT")
 ROOT_BUILD_OPTION(pythia6_nolink OFF "Delayed linking of Pythia6 library")
 ROOT_BUILD_OPTION(pythia6 ON "Enable support for Pythia 6.x")

cmake/modules/SearchInstalledSoftware.cmake

@@ -1331,6 +1331,11 @@ if(cuda OR tmva-gpu)
 endif()
 
 #---TMVA and its dependencies------------------------------------------------------------
+if (tmva AND NOT mlp)
+  message(STATUS "TMVA is enabled while MLP is not: disabling TMVA")
+  set(tmva OFF CACHE BOOL "Disabled because mlp was not activated" FORCE)
+endif()
+
 if(tmva)
   if(tmva-cpu AND imt)
     message(STATUS "Looking for BLAS for optional parts of TMVA")
@@ -1458,3 +1463,8 @@ if(webgui)
      INSTALL_COMMAND ""
      SOURCE_DIR ${CMAKE_BINARY_DIR}/ui5/distribution)
 endif()
+
+if (NOT proof)
+  message(STATUS "RooFit is enabled while Proof is not: disabling RooFit")
+  set(roofit OFF CACHE BOOL "Disabled because Proof was not activated" FORCE)
+endif()

gui/CMakeLists.txt

@@ -4,7 +4,9 @@ add_subdirectory(fitpanel)
 add_subdirectory(guibuilder)
 add_subdirectory(guihtml)
 add_subdirectory(recorder)
-add_subdirectory(sessionviewer)
+if(proof)
+   add_subdirectory(sessionviewer)
+endif()
 
 if(webgui)
    add_subdirectory(webdisplay)

main/CMakeLists.txt

@@ -9,7 +9,9 @@ if(NOT WIN32)
     SET_TARGET_PROPERTIES(rootn.exe PROPERTIES LINK_FLAGS "-Wl,--no-as-needed")
   endif()
   ROOT_EXECUTABLE(roots.exe roots.cxx LIBRARIES Core MathCore)
-  ROOT_EXECUTABLE(xpdtest xpdtest.cxx LIBRARIES Proof Tree Hist RIO Net Thread Matrix MathCore)
+  if(proof)
+    ROOT_EXECUTABLE(xpdtest xpdtest.cxx LIBRARIES Proof Tree Hist RIO Net Thread Matrix MathCore)
+  endif()
 endif()
 ROOT_EXECUTABLE(root.exe rmain.cxx LIBRARIES Core Rint)
 if(MSVC)

math/CMakeLists.txt

@@ -9,7 +9,9 @@ if(minuit2)
 endif()
 add_subdirectory(fumili)
 add_subdirectory(physics)
-add_subdirectory(mlp)
+if(mlp)
+   add_subdirectory(mlp)
+endif(mlp)
 add_subdirectory(quadp)
 add_subdirectory(foam)
 add_subdirectory(smatrix)

roofit/roofitcore/CMakeLists.txt

@@ -454,6 +454,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooFitCore
     RIO
     MathCore
     Foam
+    Proof
 )
 
 ROOT_ADD_TEST_SUBDIRECTORY(test)

test/CMakeLists.txt

@@ -271,7 +271,7 @@ ROOT_EXECUTABLE(stressHepix stressHepix.cxx LIBRARIES Core)
 #ROOT_ADD_TEST(test-stressHepix COMMAND stressHepix FAILREGEX "FAILED|Error in")
 
 #--stressProof-------------------------------------------------------------------------------
-if(NOT WIN32)
+if(proof AND NOT WIN32)
   add_custom_target(TestData COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
   ROOT_EXECUTABLE(stressProof stressProof.cxx LIBRARIES Proof ProofPlayer Hist)
   ROOT_ADD_TEST(test-stressproof PRECMD ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target TestData