Skip to content

Commit c9ac173

Browse files
committed
Fix for the PDA cmake and QC cmake
1 parent d990c87 commit c9ac173

1 file changed

Lines changed: 12 additions & 22 deletions

File tree

cmake/QualityControlDependencies.cmake

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,27 @@ find_package(FairRoot)
66
find_package(MySQL)
77

88
# todo not sure why this is needed
9-
if(BOOST_FOUND AND NOT Boost_FOUND)
9+
if (BOOST_FOUND AND NOT Boost_FOUND)
1010
set(BOOST_FOUND 1)
1111
set(Boost_FOUND 1)
12-
endif()
12+
endif ()
1313

14-
if(FAIRROOT_FOUND)
15-
# this should go away when fairrot provides a proper Find script or proper config scripts
16-
# See : http://www.cmake.org/cmake/help/v3.0/command/link_directories.html
17-
link_directories(${FAIRROOT_LIBRARY_DIR})
18-
find_package(ROOT 6.06.02 COMPONENTS RHTTP RMySQL Gui)
19-
set(FAIRROOT_LIBRARIES Base FairMQ BaseMQ)
20-
else(FAIRROOT_FOUND)
21-
message(WARNING "FairRoot not found, corresponding classes will not be compiled.")
22-
# todo not sure that it is needed (when using alibuild it hsould not)
23-
SET(ROOT_DIR "/opt/root-6/cmake/")
24-
find_package(ROOT CONFIG COMPONENTS Core RIO Net Hist Graf Graf3d Gpad Tree Rint Postscript Matrix Physics MathCore QUIET)
25-
set(FAIRROOT_LIBRARIES "")
26-
endif(FAIRROOT_FOUND)
14+
link_directories(${FAIRROOT_LIBRARY_DIR})
15+
find_package(ROOT 6.06.02 COMPONENTS RHTTP RMySQL Gui)
16+
set(FAIRROOT_LIBRARIES Base FairMQ BaseMQ)
2717

28-
if(NOT ROOT_FOUND)
18+
if (NOT ROOT_FOUND)
2919
return()
30-
endif()
20+
endif ()
3121

32-
if(NOT MYSQL_FOUND)
22+
if (NOT MYSQL_FOUND)
3323
message(WARNING "MySQL not found, the corresponding classes won't be built.")
34-
#elseif(NOT ROOT_RMySQL_LIBRARY)
35-
# message(WARNING "MySQL ROOT class not found, the corresponding classes won't be built.")
36-
else()
24+
#elseif(NOT ROOT_RMySQL_LIBRARY)
25+
# message(WARNING "MySQL ROOT class not found, the corresponding classes won't be built.")
26+
else ()
3727
add_definitions(-D_WITH_MYSQL)
3828
set(ROOT_LIBRARIES "${ROOT_LIBRARIES} -lRMySQL")
39-
endif()
29+
endif ()
4030

4131
o2_define_bucket(
4232
NAME

0 commit comments

Comments
 (0)