Skip to content

[CMake] Make Proof optional #3897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dpiparo wants to merge 2 commits into from
Closed

[CMake] Make Proof optional #3897

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19be705
[CMake] Make Proof optional, by default ON
dpiparo Jun 3, 2019
83ac56c
[CMake] Make MLP optional, by default ON
dpiparo Jun 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[CMake] Make Proof optional, by default ON
  • Loading branch information
@dpiparo
dpiparo committed Jun 4, 2019
commit 19be7057fd4cfde5b41b25e6aa243e52d4425eb0
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions cmake/modules/RootBuildOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,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")
Expand Down
5 changes: 5 additions & 0 deletions cmake/modules/SearchInstalledSoftware.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1458,3 +1458,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()
4 changes: 3 additions & 1 deletion gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions roofit/roofitcore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooFitCore
RIO
MathCore
Foam
Proof
)

ROOT_ADD_TEST_SUBDIRECTORY(test)