Skip to content

Commit a5587bb

Browse files
ChristianTackeGSIdennisklein
authored andcommitted
Prepare to disable MbsApi
An option BUILD_MBS is already available. Setting it to OFF breaks the build currently. So let's fix all those things. But still keep the default at ON to make sure, that compiling with BUILD_MBS=ON works now, at least.
1 parent 4494d76 commit a5587bb

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,9 @@ else()
302302
Set(ROOT_HAS_OPENGL FALSE)
303303
endif()
304304

305-
add_subdirectory(MbsAPI)
305+
if(BUILD_MBS)
306+
add_subdirectory(MbsAPI)
307+
endif()
306308
add_subdirectory(datamatch)
307309

308310
add_subdirectory(templates)

base/MQ/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ target_include_directories(${target} PUBLIC
4545
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/policies/Sampler>
4646
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/policies/Serialization>
4747
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/policies/Storage>
48-
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/MbsAPI>
4948
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
5049

5150
# TODO: DELETE ME ONCE USING root targets

examples/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,13 @@ if(Geant3_FOUND)
3636
add_subdirectory(simulation/rutherford)
3737
endif()
3838

39+
if(BUILD_MBS)
40+
add_subdirectory(advanced/MbsTutorial)
41+
endif()
42+
3943
if(FairMQ_FOUND AND Boost_FOUND)
40-
add_subdirectory(MQ/Lmd)
44+
if(BUILD_MBS)
45+
add_subdirectory(MQ/Lmd)
46+
endif()
4147
add_subdirectory(MQ/histogramServer)
4248
endif()
43-
44-
add_subdirectory(advanced/MbsTutorial)

0 commit comments

Comments
 (0)