Skip to content

CMake migration: fix a few glitches #2183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 2 commits into from
Jul 10, 2019
Merged

CMake migration: fix a few glitches #2183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a02a69
cmake migration: fix a few glitches
ktf Jul 10, 2019
825eb00
Update ROOT
ktf Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions dependencies/O2Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ set_package_properties(arrow PROPERTIES TYPE REQUIRED)
find_package(Vc)
set_package_properties(Vc PROPERTIES TYPE REQUIRED)

find_package(ROOT 6.06.00 MODULE)
find_package(ROOT 6.16.00 MODULE)
set_package_properties(ROOT PROPERTIES TYPE REQUIRED)

find_package(fmt)
Expand Down Expand Up @@ -130,11 +130,13 @@ set_package_properties(GLEW PROPERTIES TYPE OPTIONAL)
find_package(OpenGL)
set_package_properties(OpenGL PROPERTIES TYPE OPTIONAL)

find_package(LLVM)
set_package_properties(LLVM PROPERTIES TYPE OPTIONAL)
if(LLVM_FOUND)
find_package(Clang)
set_package_properties(Clang PROPERTIES TYPE OPTIONAL)
endif()

find_package(LLVM)
set_package_properties(LLVM PROPERTIES TYPE OPTIONAL)

find_package(O2GPU)

Expand Down
2 changes: 2 additions & 0 deletions macro/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ o2_add_test_root_macro(
initSimGeomAndField.C
PUBLIC_LINK_LIBRARIES O2::DataFormatsParameters O2::Field)

if(Geant4_FOUND)
o2_add_test_root_macro(o2sim.C
PUBLIC_LINK_LIBRARIES O2::Generators
O2::DetectorsPassive
Expand All @@ -145,6 +146,7 @@ o2_add_test_root_macro(o2sim.C
O2::CommonTypes
O2::SimSetup
O2::Steer)
endif()

# FIXME: move to subsystem dir + add includes if one wants to compile it...
# o2_add_test_root_macro( putCondition.C)
Expand Down