Skip to content

Commit d74558c

Browse files
Barthelemyknopers8
authored andcommitted
Split the QC library to extract the base types (QC-218) (#214)
* Split the QC library to extract the base types * remove commented lines
1 parent d293bea commit d74558c

3 files changed

Lines changed: 47 additions & 10 deletions

File tree

Framework/CMakeLists.txt

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,36 @@ configure_file("include/QualityControl/Version.h.in"
55
"${CMAKE_CURRENT_BINARY_DIR}/include/${MODULE_NAME}/Version.h"
66
@ONLY)
77

8+
# ---- Library for the types ----
9+
10+
add_library(QualityControlTypes
11+
src/MonitorObject.cxx
12+
src/Quality.cxx
13+
)
14+
15+
target_include_directories(
16+
QualityControlTypes
17+
PUBLIC $<INSTALL_INTERFACE:include>
18+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
19+
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
20+
)
21+
22+
target_link_libraries(QualityControlTypes
23+
PUBLIC
24+
ROOT::Hist
25+
AliceO2::Common
26+
)
27+
28+
add_root_dictionary(QualityControlTypes
29+
HEADERS include/QualityControl/MonitorObject.h
30+
include/QualityControl/Quality.h
31+
LINKDEF include/QualityControl/TypesLinkDef.h
32+
BASENAME QualityControlTypes
33+
)
34+
835
# ---- Library ----
936

1037
add_library(QualityControl
11-
src/MonitorObject.cxx
12-
src/Quality.cxx
1338
src/ObjectsManager.cxx
1439
src/Checker.cxx
1540
src/CheckerFactory.cxx
@@ -50,6 +75,7 @@ target_link_libraries(QualityControl
5075
O2::Framework
5176
O2::CCDB
5277
ms_gsl::ms_gsl
78+
QualityControlTypes
5379
PRIVATE Boost::system
5480
$<$<BOOL:${ENABLE_MYSQL}>:MySQL::MySQL>
5581
$<$<BOOL:${ENABLE_MYSQL}>:ROOT::RMySQL> ROOT::Gui
@@ -59,8 +85,7 @@ target_compile_definitions(QualityControl PRIVATE
5985
$<$<BOOL:${ENABLE_MYSQL}>:_WITH_MYSQL>)
6086

6187
add_root_dictionary(QualityControl
62-
HEADERS include/QualityControl/MonitorObject.h
63-
include/QualityControl/Quality.h
88+
HEADERS
6489
include/QualityControl/CheckInterface.h
6590
include/QualityControl/Checker.h
6691
include/QualityControl/CheckerFactory.h
@@ -247,7 +272,7 @@ endif()
247272
unset(isSystemDir)
248273

249274
# Install library and binaries
250-
install(TARGETS QualityControl ${EXE_NAMES} ${DATADUMP}
275+
install(TARGETS QualityControl QualityControlTypes ${EXE_NAMES} ${DATADUMP}
251276
EXPORT QualityControlTargets
252277
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
253278
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

Framework/include/QualityControl/LinkDef.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66
#pragma link C++ namespace o2::quality_control::core;
77
#pragma link C++ namespace o2::quality_control::checker;
88

9-
#pragma link C++ class o2::quality_control::core::CheckDefinition + ;
10-
#pragma link C++ class o2::quality_control::core::MonitorObject + ;
11-
#pragma link C++ class o2::quality_control::core::Quality + ;
12-
#pragma link C++ class o2::quality_control::checker::CheckInterface + ;
13-
#pragma link C++ class o2::quality_control::core::TaskInterface + ;
9+
#pragma link C++ class o2::quality_control::checker::CheckInterface+;
10+
#pragma link C++ class o2::quality_control::core::TaskInterface+;
1411

1512
#pragma link C++ class std::pair < std::string, o2::quality_control::core::CheckDefinition>;
1613
#pragma link C++ class std::map < std::string, o2::quality_control::core::CheckDefinition>;
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#ifdef __CLING__
2+
#pragma link off all globals;
3+
#pragma link off all classes;
4+
#pragma link off all functions;
5+
6+
#pragma link C++ namespace o2::quality_control::core;
7+
8+
#pragma link C++ class o2::quality_control::core::CheckDefinition+;
9+
#pragma link C++ class o2::quality_control::core::MonitorObject+;
10+
#pragma link C++ class o2::quality_control::core::Quality+;
11+
12+
#pragma link C++ class std::pair < std::string, o2::quality_control::core::CheckDefinition>;
13+
#pragma link C++ class std::map < std::string, o2::quality_control::core::CheckDefinition>;
14+
15+
#endif

0 commit comments

Comments
 (0)