Skip to content

Commit b433086

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 c2d21e9 commit b433086

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
@@ -291,7 +291,9 @@ else()
291291
Set(ROOT_HAS_OPENGL FALSE)
292292
endif()
293293

294-
add_subdirectory(MbsAPI)
294+
if(BUILD_MBS)
295+
add_subdirectory(MbsAPI)
296+
endif()
295297
add_subdirectory(datamatch)
296298

297299
add_subdirectory(templates)

base/MQ/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ target_include_directories(${target} PUBLIC
6767
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/policies/Sampler>
6868
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/policies/Serialization>
6969
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/policies/Storage>
70-
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/MbsAPI>
7170
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
7271

7372
# TODO: DELETE ME ONCE USING root targets

examples/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,13 @@ if(Geant3_FOUND)
3333
add_subdirectory(simulation/rutherford)
3434
endif()
3535

36+
if(BUILD_MBS)
37+
add_subdirectory(advanced/MbsTutorial)
38+
endif()
39+
3640
if(FairMQ_FOUND AND Boost_FOUND)
37-
add_subdirectory(MQ/Lmd)
41+
if(BUILD_MBS)
42+
add_subdirectory(MQ/Lmd)
43+
endif()
3844
add_subdirectory(MQ/histogramServer)
3945
endif()
40-
41-
add_subdirectory(advanced/MbsTutorial)

0 commit comments

Comments
 (0)