File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -26,8 +26,6 @@ include(O2Utils)
2626include (QualityControlDependencies )
2727include (O2 ) # to be removed
2828
29- link_o2_subproject (DataSampling )
30-
3129add_subdirectory (doc )
3230
3331# TODO make it required, once in its own repo
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ find_package(FairRoot)
66find_package (MySQL )
77find_package (Common REQUIRED )
88find_package (InfoLogger REQUIRED )
9+ find_package (DataSampling REQUIRED )
910
1011# todo not sure why this is needed
1112if (BOOST_FOUND AND NOT Boost_FOUND)
@@ -38,13 +39,14 @@ o2_define_bucket(
3839 ${Boost_LOG_LIBRARY}
3940 ${Boost_THREAD_LIBRARY}
4041 ${Boost_SYSTEM_LIBRARY}
42+ ${Boost_PROGRAM_OPTIONS_LIBRARY}
4143 ${Common_LIBRARIES}
4244 ${Configuration_LIBRARIES}
43- DataSampling
4445 ${Monitoring_LIBRARIES}
4546 ${ROOT_LIBRARIES}
4647 ${Boost_LOG_DEBUG}
4748 ${InfoLogger_LIBRARIES}
49+ ${DataSampling_LIBRARIES}
4850
4951 SYSTEMINCLUDE_DIRECTORIES
5052 ${Boost_INCLUDE_DIRS}
@@ -55,6 +57,7 @@ o2_define_bucket(
5557 ${ZEROMQ_INCLUDE_DIR}
5658 ${Common_INCLUDE_DIRS}
5759 ${InfoLogger_INCLUDE_DIRS}
60+ ${DataSampling_INCLUDE_DIRS}
5861)
5962
6063o2_define_bucket (
@@ -67,4 +70,5 @@ o2_define_bucket(
6770
6871 SYSTEMINCLUDE_DIRECTORIES
6972 ${FAIRROOT_INCLUDE_DIR}
73+ ${FAIRROOT_INCLUDE_DIR} /fairmq
7074)
You can’t perform that action at this time.
0 commit comments