Skip to content
Snippets Groups Projects
Commit 5df60e83 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'cmake.RootUtils-20201111' into 'master'

RootUtils: cmake fix for clang compilation

See merge request !38110
parents 5aafcab6 d74a04c6
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!38110RootUtils: cmake fix for clang compilation
...@@ -9,6 +9,9 @@ find_package( Python COMPONENTS Development ) ...@@ -9,6 +9,9 @@ find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS RIO Hist Tree Core MathCore ROOTTPython find_package( ROOT COMPONENTS RIO Hist Tree Core MathCore ROOTTPython
cppyy${Python_VERSION_MAJOR}_${Python_VERSION_MINOR} ) cppyy${Python_VERSION_MAJOR}_${Python_VERSION_MINOR} )
set( ROOT_LIBRARIES_PYROOT ${ROOT_LIBRARIES} )
find_package( ROOT COMPONENTS RIO Hist Tree Core MathCore )
# Component(s) in the package: # Component(s) in the package:
atlas_generate_reflex_dictionary( dict_cpp RootUtils atlas_generate_reflex_dictionary( dict_cpp RootUtils
HEADER ${CMAKE_CURRENT_SOURCE_DIR}/RootUtils/RootUtilsDict.h HEADER ${CMAKE_CURRENT_SOURCE_DIR}/RootUtils/RootUtilsDict.h
...@@ -28,7 +31,7 @@ atlas_add_library( RootUtilsPyROOT ...@@ -28,7 +31,7 @@ atlas_add_library( RootUtilsPyROOT
PUBLIC_HEADERS RootUtils PUBLIC_HEADERS RootUtils
INCLUDE_DIRS ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} INCLUDE_DIRS ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${ROOT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Python_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} LINK_LIBRARIES ${Python_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES_PYROOT}
CxxUtils ) CxxUtils )
atlas_add_dictionary( RootUtilsPyROOTDict atlas_add_dictionary( RootUtilsPyROOTDict
......
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