Changes to make geoModel work

Matthewharri · Mar 27, 2024 · 4000e25 · 4000e25
1 parent f6ed901
commit 4000e25
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,7 @@ option(ACTS_BUILD_PLUGIN_DD4HEP "Build DD4hep plugin" OFF)
 option(ACTS_BUILD_PLUGIN_PODIO "Build Podio plugin" OFF)
 option(ACTS_BUILD_PLUGIN_EDM4HEP "Build EDM4hep plugin" OFF)
 option(ACTS_BUILD_PLUGIN_FPEMON "Build FPE monitoring plugin" OFF)
-option(ACTS_BUILD_PLUGIN_GEOMODEL "Build GeoModel plugin" OFF)
+option(ACTS_BUILD_PLUGIN_GEOMODEL "Build GeoModel plugin" ON)
 option(ACTS_USE_SYSTEM_GEOMODEL "Use a system-provided GeoModel installation" ${ACTS_USE_SYSTEM_LIBS})
 option(ACTS_BUILD_PLUGIN_GEANT4 "Build Geant4 plugin" OFF)
 option(ACTS_BUILD_PLUGIN_EXATRKX "Build the Exa.TrkX plugin" OFF)
@@ -188,7 +188,7 @@ set(_acts_autodiff_version 0.6)
 set(_acts_boost_version 1.71.0)
 set(_acts_dd4hep_version 1.21)
 set(_acts_edm4hep_version 0.7)
-set(_acts_geomodel_version 4.6.0)
+set(_acts_geomodel_version 5.3.0)
 set(_acts_podio_version 0.16)
 set(_acts_doxygen_version 1.9.4)
 set(_acts_eigen3_version 3.3.7)
@@ -301,7 +301,7 @@ endif()
 if(ACTS_BUILD_PLUGIN_GEOMODEL)
   if(ACTS_USE_SYSTEM_GEOMODEL)
     message(STATUS "Using system installation of GeoModel")
-    find_package(GeoModel ${_acts_geomodel_version} REQUIRED CONFIG)
+    find_package(GeoModelCore ${_acts_geomodel_version} COMPONENTS GeoModelKernel REQUIRED CONFIG)
   else()
     add_subdirectory(thirdparty/GeoModel)
   endif()

diff --git a/Plugins/CMakeLists.txt b/Plugins/CMakeLists.txt
@@ -5,6 +5,7 @@ add_component_if(ActSVG PluginActSVG ACTS_BUILD_PLUGIN_ACTSVG)
 add_component_if(Cuda PluginCuda ACTS_BUILD_PLUGIN_CUDA)
 add_component_if(FpeMonitoring PluginFpeMonitoring ACTS_BUILD_PLUGIN_FPEMON)
 add_component_if(Geant4 PluginGeant4 ACTS_BUILD_PLUGIN_GEANT4)
+add_component_if(GeoModel PluginGeoModel ACTS_BUILD_PLUGIN_GEOMODEL)
 add_component_if(Identification PluginIdentification ACTS_BUILD_PLUGIN_IDENTIFICATION)
 add_component_if(Json PluginJson ACTS_BUILD_PLUGIN_JSON)
 add_component_if(Legacy PluginLegacy ACTS_BUILD_PLUGIN_LEGACY)

diff --git a/cmake/ActsConfig.cmake.in b/cmake/ActsConfig.cmake.in
@@ -76,6 +76,9 @@ endif()
 if(PluginPodio IN_LIST Acts_COMPONENTS)
   find_dependency(podio @podio_VERSION@ CONFIG EXACT)
 endif()
+if(PluginGeoModel IN_LIST Acts_COMPONENTS)
+  find_dependency(GeoModelCore @GeoModelCore_VERSION@ CONFIG EXACT)
+endif()
 
 # dependencies that we have built ourselves but cannot be
 # straightforwardly handed to cmake