cmake: Switch ROOT to config mode

Instead of using the internal find module, let's use ROOT's own cmake config mode system.
FairRootGroup · Apr 13, 2021 · 764b2c6 · 764b2c6
1 parent 4a09e58
commit 764b2c6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 201 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -162,7 +162,16 @@ if(SIMPATH)
 endif()
 
 # FairRoot only supports ROOT6, so check which version is available
-find_package2(PUBLIC ROOT  VERSION 6.10.00  REQUIRED)
+list(APPEND required_root_components RIO)
+if(BUILD_SIM)
+  list(APPEND required_root_components pythia6 pythia8)
+endif()
+list(APPEND optional_root_components opengl)
+list(APPEND optional_root_components gdml vmc)
+find_package2(PUBLIC ROOT REQUIRED
+  VERSION 6.18.00
+  COMPONENTS ${required_root_components}
+  OPTIONAL_COMPONENTS ${optional_root_components})
 include(ROOTMacros)
 if(ROOT_vmc_FOUND)
   set(VMCLIB ROOT::VMC)

diff --git a/cmake/modules/FairRootTargetRootDictionary.cmake b/cmake/modules/FairRootTargetRootDictionary.cmake
@@ -132,7 +132,7 @@ function(fairroot_target_root_dictionary target)
     OUTPUT ${dictionaryFile} ${pcmFile} ${rootmapFile}
     VERBATIM
     COMMAND ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$ENV{LD_LIBRARY_PATH}"
-      ${ROOT_CINT_EXECUTABLE}
+      $<TARGET_FILE:ROOT::rootcling>
       -f ${dictionaryFile}
       -inlineInputHeader
       -rmf ${rootmapFile}

diff --git a/cmake/modules/FindROOT.cmake b/cmake/modules/FindROOT.cmake