initial support for COMPONENTS options in FindROOT.cmake

GaudiAlg/CMakeLists.txt

@@ -6,13 +6,14 @@ require(GaudiUtils GaudiKernel)
 
 find_package(AIDA)
 find_package(Boost COMPONENTS regex)
+find_package(ROOT COMPONENTS RIO)
 
 #---Libraries---------------------------------------------------------------
 gaudi_add_library(GaudiAlgLib lib/*.cpp
                      LINK_LIBRARIES GaudiUtilsLib ${Boost_LIBRARIES}
                      INCLUDE_DIRS Boost AIDA)
 gaudi_add_module(GaudiAlg components/*.cpp
-                        LINK_LIBRARIES GaudiAlgLib GaudiKernel ${ROOT_LIBRARIES} ${ROOT_RIO_LIBRARY}
+                        LINK_LIBRARIES GaudiAlgLib GaudiKernel ${ROOT_LIBRARIES}
                         INCLUDE_DIRS Boost AIDA)
 
 #---Installation------------------------------------------------------------

GaudiCommonSvc/CMakeLists.txt

@@ -2,10 +2,10 @@ require(GaudiKernel)
 
 find_package(AIDA)
 find_package(Boost COMPONENTS system filesystem)
-find_package(ROOT)
+find_package(ROOT COMPONENTS Hist RIO)
 
 #---Libraries---------------------------------------------------------------
 gaudi_add_module(GaudiCommonSvc
                         *.cpp DataSvc/*.cpp HistogramSvc/*.cpp PersistencySvc/*.cpp
-                        LINK_LIBRARIES GaudiKernel ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${ROOT_Hist_LIBRARY} ${ROOT_RIO_LIBRARY}
+                        LINK_LIBRARIES GaudiKernel ${Boost_LIBRARIES} ${ROOT_LIBRARIES}
                         INCLUDE_DIRS Boost ROOT AIDA)

GaudiExamples/CMakeLists.txt

@@ -5,7 +5,7 @@
 require(GaudiKernel GaudiUtils GaudiGSL GaudiAlg)
 
 find_package(HepPDT)
-find_package(ROOT)
+find_package(ROOT COMPONENTS Tree RIO Hist)
 find_package(Boost COMPONENTS python)
 find_package(CLHEP)
 find_package(GSL)
@@ -46,7 +46,7 @@ StatusCodeSvc/*.cpp
 testing/*.cpp )
 
 gaudi_add_library(GaudiExamplesLib Lib/*.cpp
-                     LINK_LIBRARIES GaudiGSLLib GaudiUtilsLib ${HEPPDT_LIBRARIES} ${ROOT_Tree_LIBRARY}
+                     LINK_LIBRARIES GaudiGSLLib GaudiUtilsLib ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES}
                      INCLUDE_DIRS HepPDT ROOT ${CMAKE_CURRENT_SOURCE_DIR}/src/Lib)
 gaudi_add_module(GaudiExamples ${GaudiExamples_srcs} LINK_LIBRARIES GaudiExamplesLib)
 GAUDI_PYTHON_MODULE(PyExample PythonModule/*.cpp
@@ -57,7 +57,7 @@ GAUDI_INSTALL_PYTHON_MODULES()
 
 #---Executables-------------------------------------------------------------
 GAUDI_EXECUTABLE(Allocator Allocator/*.cpp LINK_LIBRARIES GaudiExamplesLib GaudiAlgLib GaudiKernel ${ROOT_LIBRARIES}
-                 ${ROOT_RIO_LIBRARY} ${ROOT_Hist_LIBRARY} ${CLHEP_LIBRARIES} ${GSL_LIBRARIES}
+                 ${CLHEP_LIBRARIES} ${GSL_LIBRARIES}
                  INCLUDE_DIRS CLHEP GSL)
 
 

GaudiSvc/CMakeLists.txt

@@ -6,7 +6,7 @@ require(GaudiKernel)
 
 find_package(AIDA)
 find_package(Boost REQUIRED COMPONENTS regex)
-find_package(ROOT)
+find_package(ROOT COMPONENTS Hist RIO Tree)
 find_package(CLHEP)
 
 #---Libraries---------------------------------------------------------------
@@ -17,8 +17,7 @@ RndmGenSvc/*.cpp
 THistSvc/*.cpp)
 
 gaudi_add_module(GaudiSvc ${GaudiSvc_srcs}
-                        LINK_LIBRARIES GaudiKernel ${ROOT_LIBRARIES} ${ROOT_Hist_LIBRARY}
-                                  ${ROOT_RIO_LIBRARY} ${ROOT_Tree_LIBRARY} ${CLHEP_LIBRARIES}
+                        LINK_LIBRARIES GaudiKernel ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES}
                                   ${Boost_LIBRARIES}
                         INCLUDE_DIRS Boost ROOT AIDA CLHEP)
 

GaudiUtils/CMakeLists.txt

@@ -6,13 +6,13 @@ require(GaudiKernel)
 
 find_package(Boost)
 find_package(AIDA)
-find_package(ROOT)
+find_package(ROOT COMPONENTS RIO Hist XMLIO)
 find_package(XercesC)
 find_package(uuid)
 
 #---Libraries---------------------------------------------------------------
 gaudi_add_library(GaudiUtilsLib Lib/*.cpp
-                     LINK_LIBRARIES GaudiKernel ${ROOT_LIBRARIES} ${ROOT_RIO_LIBRARY} ${ROOT_Hist_LIBRARY} ${ROOT_XMLIO_LIBRARY}
+                     LINK_LIBRARIES GaudiKernel ${ROOT_LIBRARIES}
                      INCLUDE_DIRS ROOT AIDA)
 gaudi_add_module(GaudiUtils component/*.cpp
                         LINK_LIBRARIES GaudiUtilsLib ${UUID_LIBRARIES} ${XERCESC_LIBRARIES}

PartPropSvc/CMakeLists.txt

@@ -5,12 +5,12 @@
 require(GaudiKernel)
 
 find_package(Boost COMPONENTS regex)
-find_package(ROOT)
+find_package(ROOT COMPONENTS Reflex)
 find_package(HepPDT)
 
 #---Libraries---------------------------------------------------------------
 gaudi_add_module(PartPropSvc *.cpp
-                        LINK_LIBRARIES GaudiKernel ${ROOT_Reflex_LIBRARY} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES}
+                        LINK_LIBRARIES GaudiKernel ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES}
                         INCLUDE_DIRS Boost ROOT HepPDT)
 
 #---Installation------------------------------------------------------------

RootCnv/CMakeLists.txt

 require(GaudiKernel GaudiUtils)
 
-find_package(ROOT)
+find_package(ROOT COMPONENTS RIO Tree TreePlayer MathCore)
 
 gaudi_install_headers(RootCnv)
 
@@ -8,9 +8,7 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS __POOL_COMPATIBILITY)
 
 gaudi_add_library(RootCnvLib
                      *.cpp
-                     LINK_LIBRARIES GaudiKernel GaudiUtilsLib
-                               ${ROOT_RIO_LIBRARY} ${ROOT_Tree_LIBRARY}
-                               ${ROOT_TreePlayer_LIBRARY} ${ROOT_MathCore_LIBRARY}
+                     LINK_LIBRARIES GaudiKernel GaudiUtilsLib ${ROOT_LIBRARIES}
                      INCLUDE_DIRS GaudiKernel GaudiUtilsLib)
 
 gaudi_add_module(RootCnv

RootHistCnv/CMakeLists.txt

@@ -5,11 +5,10 @@
 require(GaudiKernel)
 
 find_package(AIDA)
-find_package(ROOT)
+find_package(ROOT COMPONENTS RIO Hist Matrix Tree)
 find_package(Boost)
 
 #---Libraries---------------------------------------------------------------
 gaudi_add_module(RootHistCnv *.cpp
-                        LINK_LIBRARIES GaudiKernel ${ROOT_LIBRARIES} ${ROOT_RIO_LIBRARY}
-                                  ${ROOT_Hist_LIBRARY} ${ROOT_Matrix_LIBRARY} ${ROOT_Tree_LIBRARY}
+                        LINK_LIBRARIES GaudiKernel ${ROOT_LIBRARIES}
                         INCLUDE_DIRS Boost ROOT AIDA)

cmake/modules/FindROOT.cmake

-# - Locate the ROOT headers and libraries
+# - Find the ROOT libraries, headers and tools.
+# Components:
+#   Core Cint Reflex RIO Hist Tree TreePlayer Cintex Matrix GenVector MathCore MathMore XMLIO
 
 find_path(ROOT_INCLUDE_DIR TROOT.h)
 
@@ -8,16 +10,15 @@ set(ROOTSYS ${ROOTSYS} CACHE PATH "Location of the installation of ROOT")
 set(ROOT_INCLUDE_DIRS ${ROOTSYS}/include)
 set(ROOT_LIBRARY_DIRS ${ROOTSYS}/lib)
 
-set(ROOT_COMPONENTS Core Cint Reflex RIO Hist Tree TreePlayer Cintex Matrix GenVector MathCore MathMore XMLIO)
+set(ROOT_ALL_COMPONENTS Core Cint Reflex RIO Hist Tree TreePlayer Cintex Matrix GenVector MathCore MathMore XMLIO)
 
-foreach(component ${ROOT_COMPONENTS})
+foreach(component ${ROOT_FIND_COMPONENTS} Core Cint Reflex)
   find_library(ROOT_${component}_LIBRARY NAMES ${component}
                PATH ${ROOT_LIBRARY_DIRS})
   mark_as_advanced(ROOT_${component}_LIBRARY)
+  set(ROOT_LIBRARIES ${ROOT_LIBRARIES} ${ROOT_${component}_LIBRARY})
 endforeach()
 
-set(ROOT_LIBRARIES ${ROOT_Core_LIBRARY} ${ROOT_Cint_LIBRARY} ${ROOT_Reflex_LIBRARY})
-
 set(ROOT_genreflex_cmd ${ROOTSYS}/bin/genreflex)
 set(ROOT_genmap_cmd ${ROOTSYS}/bin/genmap)