Skip to content
Snippets Groups Projects
Commit 8f543915 authored by Daniel Hugo Campora Perez's avatar Daniel Hugo Campora Perez
Browse files

Merge branch 'fix_compilation_with_ROOT' into 'master'

fix compilation with ROOT

See merge request lhcb-parallelization/cuda_hlt!14
parents 361e7448 a65acfe9
No related branches found
No related tags found
1 merge request!14fix compilation with ROOT
......@@ -37,9 +37,9 @@ if ( EXISTS $ENV{ROOTSYS} )
list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS})
else() # ROOT was compiled with configure/make
list(APPEND CMAKE_MODULE_PATH $ENV{ROOTSYS}/etc/cmake)
endif()
find_package( ROOT )
if ( ROOT_FOUND )
endif()
find_package( ROOT )
if ( ROOT_FOUND )
message("-- Compiling with ROOT: ${ROOT_INCLUDE_DIRS}")
else()
message("-- Compiling without ROOT")
......@@ -84,8 +84,8 @@ file(GLOB main_sources "main/src/*")
cuda_add_executable(cu_hlt ${main_sources})
if ( ROOT_FOUND )
target_compile_definitions(cu_hlt PUBLIC WITH_ROOT)
if ( ROOT_FOUND )
target_compile_definitions(cu_hlt PUBLIC WITH_ROOT)
target_link_libraries(cu_hlt
tbb
Velo
......
......@@ -38,6 +38,7 @@ cuda_add_library(Stream STATIC
)
if ( ROOT_FOUND )
target_compile_definitions(Stream PUBLIC WITH_ROOT)
target_link_libraries(Stream
Velo
VeloUT
......@@ -49,5 +50,3 @@ else()
VeloUT
x86VeloUT)
endif()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment