From eb4c5c0db848fd7dd88fddbd6c441e49d1ad71e8 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <attila.krasznahorkay@cern.ch>
Date: Tue, 18 Jun 2024 09:36:24 +0200
Subject: [PATCH] Header Relocatability, main branch (2024.06.03.)
---
.gitignore | 4 +-
.../DummyUserActionsPlugin/CMakeLists.txt | 9 +--
.../GeoGenericFunctions/CMakeLists.txt | 4 +-
GeoModelCore/GeoModelKernel/CMakeLists.txt | 11 ++-
.../KitchenSinkPlugin/CMakeLists.txt | 13 +--
GeoModelExamples/MinimalPlugin/CMakeLists.txt | 13 +--
.../SurfaceTestPlugin/CMakeLists.txt | 13 +--
GeoModelG4/GeoMaterial2G4/CMakeLists.txt | 6 +-
GeoModelG4/GeoModel2G4/CMakeLists.txt | 6 +-
.../original_GeoModel2G4/CMakeLists.txt | 4 +-
GeoModelIO/GeoModelDBManager/CMakeLists.txt | 4 +-
.../GeoModelErrorHandler/CMakeLists.txt | 4 +-
GeoModelIO/GeoModelIOHelpers/CMakeLists.txt | 4 +-
GeoModelIO/GeoModelRead/CMakeLists.txt | 4 +-
GeoModelIO/GeoModelWrite/CMakeLists.txt | 4 +-
GeoModelIO/TFPersistification/CMakeLists.txt | 4 +-
.../GeoModelXML/GMXPlugin/CMakeLists.txt | 15 +---
.../GeoModelXML/GeoModelXml/CMakeLists.txt | 6 +-
.../GXClashPointSystems/CMakeLists.txt | 4 +-
.../GXHitDisplaySystems/CMakeLists.txt | 8 +-
.../GXTrackDisplaySystems/CMakeLists.txt | 8 +-
GeoModelVisualization/VP1Base/CMakeLists.txt | 6 +-
.../VP1GeometryPlugin/CMakeLists.txt | 4 +-
.../VP1GeometrySystems/CMakeLists.txt | 4 +-
GeoModelVisualization/VP1Gui/CMakeLists.txt | 4 +-
.../VP1GuideLineSystems/CMakeLists.txt | 4 +-
.../VP1HEPVis/CMakeLists.txt | 4 +-
athena_ci/apply_patches.sh | 18 +++--
...ce-change-using-GeoPositioning-objec.patch | 80 -------------------
29 files changed, 81 insertions(+), 191 deletions(-)
delete mode 100644 athena_ci/patches/0001-Adapt-to-interface-change-using-GeoPositioning-objec.patch
diff --git a/.gitignore b/.gitignore
index 6defc076d..499b9772e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,5 @@
*.swp
*.swo
-
-
+# VSCode default build directory
+build/
diff --git a/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt b/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt
index 617b3e584..0d1fcd998 100644
--- a/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt
+++ b/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Set up the project.
cmake_minimum_required(VERSION 3.16...3.26)
project( "DummyUserActionsPlugin" )
@@ -10,7 +10,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
# Make the root module directory visible to CMake.
list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../../cmake )
# get global GeoModel version
- include( GeoModelATLAS-version )
+ include( GeoModelATLAS-version )
# set the project, with the version taken from the GeoModel parent project
project( "DummyUserActionsPlugin" VERSION ${GeoModelATLAS_VERSION} LANGUAGES CXX )
# Define color codes for CMake messages
@@ -58,9 +58,8 @@ file( GLOB SOURCES src/*.cxx )
add_library( DummyUserActionsPlugin SHARED ${SOURCES} )
target_link_libraries ( DummyUserActionsPlugin PUBLIC FullSimLight ${CMAKE_DL_LIBS} ${Geant4_LIBRARIES} )
-target_include_directories( DummyUserActionsPlugin PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> ${FullSimLight_INCLUDE_DIR} )
+target_include_directories( DummyUserActionsPlugin PUBLIC
+ ${FullSimLight_INCLUDE_DIR} )
source_group( "src" FILES ${SOURCES} )
diff --git a/GeoModelCore/GeoGenericFunctions/CMakeLists.txt b/GeoModelCore/GeoGenericFunctions/CMakeLists.txt
index 67fcfca3f..11e7233e1 100644
--- a/GeoModelCore/GeoGenericFunctions/CMakeLists.txt
+++ b/GeoModelCore/GeoGenericFunctions/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cpp )
@@ -8,7 +8,7 @@ file( GLOB HEADERS GeoGenericFunctions/*.h GeoGenericFunctions/*.icc )
add_library( GeoGenericFunctions SHARED ${HEADERS} ${SOURCES} )
target_include_directories( GeoGenericFunctions PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "GeoGenericFunctions" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} )
set_target_properties( GeoGenericFunctions PROPERTIES
diff --git a/GeoModelCore/GeoModelKernel/CMakeLists.txt b/GeoModelCore/GeoModelKernel/CMakeLists.txt
index 11b72cbb7..f4242540e 100644
--- a/GeoModelCore/GeoModelKernel/CMakeLists.txt
+++ b/GeoModelCore/GeoModelKernel/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
@@ -10,7 +10,7 @@ target_link_libraries( GeoModelKernel PUBLIC Eigen3::Eigen GeoGenericFunctions
${CMAKE_DL_LIBS} )
target_include_directories( GeoModelKernel PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "GeoModelKernel" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} )
set_target_properties( GeoModelKernel PROPERTIES
@@ -51,15 +51,14 @@ install( FILES ${HEADERS}
foreach(_exeFile ${files})
get_filename_component(_theExec ${_exeFile} NAME_WE)
get_filename_component(_theLoc ${_exeFile} DIRECTORY)
-
+
if(${_theLoc} MATCHES "DoNotBuild")
continue()
- endif()
-
+ endif()
+
add_executable(${_theExec} ${_exeFile})
target_link_libraries( ${_theExec} GeoModelKernel)
add_test(NAME ${_theExec}
COMMAND ${_theExec})
endforeach()
-
diff --git a/GeoModelExamples/KitchenSinkPlugin/CMakeLists.txt b/GeoModelExamples/KitchenSinkPlugin/CMakeLists.txt
index 03fe58070..52287268c 100644
--- a/GeoModelExamples/KitchenSinkPlugin/CMakeLists.txt
+++ b/GeoModelExamples/KitchenSinkPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
################################################################################
# Package: HelloGeo
@@ -14,11 +14,11 @@ set(CMAKE_CXX_EXTENSIONS ON)
# Find the needed dependencies, when building individually
- message (${CMAKE_SOURCE_DIR})
+ message (${CMAKE_SOURCE_DIR})
message (${PROJECT_SOURCE_DIR})
-
+
if ( CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR ) # when buildingindividually
- find_package( GeoModelCore REQUIRED )
+ find_package( GeoModelCore REQUIRED )
endif()
@@ -28,10 +28,6 @@ file( GLOB SOURCES src/*.cxx )
add_library( KitchenSinkPlugin SHARED ${SOURCES} )
target_link_libraries( KitchenSinkPlugin PUBLIC GeoModelCore::GeoModelKernel)
-target_include_directories( KitchenSinkPlugin PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
-
source_group( "src" FILES ${SOURCES} )
set_target_properties( KitchenSinkPlugin PROPERTIES
@@ -44,4 +40,3 @@ install( TARGETS KitchenSinkPlugin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT Runtime
NAMELINK_SKIP )
-
diff --git a/GeoModelExamples/MinimalPlugin/CMakeLists.txt b/GeoModelExamples/MinimalPlugin/CMakeLists.txt
index f18dbe0f1..59c5a684d 100644
--- a/GeoModelExamples/MinimalPlugin/CMakeLists.txt
+++ b/GeoModelExamples/MinimalPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
################################################################################
# Package: MinimalPlugin
@@ -14,11 +14,11 @@ set(CMAKE_CXX_EXTENSIONS ON)
# Find the needed dependencies, when building individually
- message (${CMAKE_SOURCE_DIR})
+ message (${CMAKE_SOURCE_DIR})
message (${PROJECT_SOURCE_DIR})
-
+
if ( CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR ) # when buildingindividually
- find_package( GeoModelCore REQUIRED )
+ find_package( GeoModelCore REQUIRED )
endif()
@@ -28,10 +28,6 @@ file( GLOB SOURCES src/*.cxx )
add_library( MinimalPlugin SHARED ${SOURCES} )
target_link_libraries( MinimalPlugin PUBLIC GeoModelCore::GeoModelKernel)
-target_include_directories( MinimalPlugin PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
-
source_group( "src" FILES ${SOURCES} )
set_target_properties( MinimalPlugin PROPERTIES
@@ -44,4 +40,3 @@ install( TARGETS MinimalPlugin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT Runtime
NAMELINK_SKIP )
-
diff --git a/GeoModelExamples/SurfaceTestPlugin/CMakeLists.txt b/GeoModelExamples/SurfaceTestPlugin/CMakeLists.txt
index 4a8db4175..8c2f86068 100644
--- a/GeoModelExamples/SurfaceTestPlugin/CMakeLists.txt
+++ b/GeoModelExamples/SurfaceTestPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
################################################################################
# Package: HelloGeo
@@ -14,11 +14,11 @@ set(CMAKE_CXX_EXTENSIONS ON)
# Find the needed dependencies, when building individually
- message (${CMAKE_SOURCE_DIR})
+ message (${CMAKE_SOURCE_DIR})
message (${PROJECT_SOURCE_DIR})
-
+
if ( CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR ) # when buildingindividually
- find_package( GeoModelCore REQUIRED )
+ find_package( GeoModelCore REQUIRED )
endif()
@@ -28,10 +28,6 @@ file( GLOB SOURCES src/*.cxx )
add_library( SurfaceTestPlugin SHARED ${SOURCES} )
target_link_libraries( SurfaceTestPlugin PUBLIC GeoModelCore::GeoModelKernel GeoModelCore::GeoModelHelpers)
-target_include_directories( SurfaceTestPlugin PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
-
source_group( "src" FILES ${SOURCES} )
set_target_properties( SurfaceTestPlugin PROPERTIES
@@ -44,4 +40,3 @@ install( TARGETS SurfaceTestPlugin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT Runtime
NAMELINK_SKIP )
-
diff --git a/GeoModelG4/GeoMaterial2G4/CMakeLists.txt b/GeoModelG4/GeoMaterial2G4/CMakeLists.txt
index 434517536..717e9ead3 100644
--- a/GeoModelG4/GeoMaterial2G4/CMakeLists.txt
+++ b/GeoModelG4/GeoMaterial2G4/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
################################################################################
# Package: GeoMaterial2G4
@@ -18,7 +18,7 @@ add_library( GeoMaterial2G4 SHARED ${HEADERS} ${SOURCES} )
target_include_directories( GeoMaterial2G4
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
target_link_libraries( GeoMaterial2G4 PUBLIC GeoModelCore::GeoModelKernel ${Geant4_LIBRARIES} )
# Set installation of library headers
@@ -30,6 +30,6 @@ set_target_properties( GeoMaterial2G4 PROPERTIES
# new test GeoModelG4
install(TARGETS GeoMaterial2G4
- EXPORT GeoMaterial2G4-export
+ EXPORT GeoMaterial2G4-export
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoMaterial2G4 )
diff --git a/GeoModelG4/GeoModel2G4/CMakeLists.txt b/GeoModelG4/GeoModel2G4/CMakeLists.txt
index 143c8f22d..157a3cf88 100644
--- a/GeoModelG4/GeoModel2G4/CMakeLists.txt
+++ b/GeoModelG4/GeoModel2G4/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
################################################################################
# Package: GeoModel2G4
@@ -38,7 +38,7 @@ target_compile_definitions(GeoModel2G4 PRIVATE G4EXTENSION_SOLID_DIR=${PATHEXTEN
target_include_directories(GeoModel2G4
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
target_link_libraries(GeoModel2G4
PUBLIC ${Geant4_LIBRARIES}
PRIVATE GeoMaterial2G4 GeoModelCore::GeoModelKernel)
@@ -52,6 +52,6 @@ set_target_properties( GeoModel2G4 PROPERTIES
SOVERSION ${PROJECT_VERSION_MAJOR} )
# Install the library.
install( TARGETS GeoModel2G4
- EXPORT GeoModel2G4-export
+ EXPORT GeoModel2G4-export
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModel2G4 )
diff --git a/GeoModelG4/GeoModel2G4/original_GeoModel2G4/CMakeLists.txt b/GeoModelG4/GeoModel2G4/original_GeoModel2G4/CMakeLists.txt
index 55c9883f6..fafcfaedd 100644
--- a/GeoModelG4/GeoModel2G4/original_GeoModel2G4/CMakeLists.txt
+++ b/GeoModelG4/GeoModel2G4/original_GeoModel2G4/CMakeLists.txt
@@ -53,12 +53,10 @@ target_link_libraries( Geo2G4Lib
target_include_directories( Geo2G4Lib SYSTEM PUBLIC ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} PRIVATE ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODEL_INCLUDE_DIRS} )
target_include_directories( Geo2G4Lib PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
### TODO: do we need this from Athena? Maybe not...
# atlas_add_component( Geo2G4 ... )
### TODO: do we need this from Athena? Maybe not...
# atlas_add_dictionary( LArWheelSolidCheckerDict ... )
-
-
diff --git a/GeoModelIO/GeoModelDBManager/CMakeLists.txt b/GeoModelIO/GeoModelDBManager/CMakeLists.txt
index 7eb42f1af..a7f20d61c 100644
--- a/GeoModelIO/GeoModelDBManager/CMakeLists.txt
+++ b/GeoModelIO/GeoModelDBManager/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
################################################################################
# Package: GeoModelDBManager
# author: Riccardo Maria BIANCHI @ CERN - 2017
@@ -16,7 +16,7 @@ add_library( GeoModelDBManager SHARED ${HEADERS} ${SOURCES} )
target_link_libraries( GeoModelDBManager PRIVATE SQLite::SQLite3 )
target_include_directories( GeoModelDBManager PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "GeoModelDBManager" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} )
set_target_properties( GeoModelDBManager PROPERTIES
diff --git a/GeoModelIO/GeoModelErrorHandler/CMakeLists.txt b/GeoModelIO/GeoModelErrorHandler/CMakeLists.txt
index 59b93fabb..55b7f30dc 100644
--- a/GeoModelIO/GeoModelErrorHandler/CMakeLists.txt
+++ b/GeoModelIO/GeoModelErrorHandler/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Set up how CMake should handle file names given to target_sources().
if( POLICY CMP0076 )
@@ -13,7 +13,7 @@ add_library( GeoModelErrorHandler INTERFACE )
source_group( "GeoModelErrorHandler" FILES ${HEADERS} )
target_include_directories( GeoModelErrorHandler INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
target_link_libraries( GeoModelErrorHandler INTERFACE Qt5::Core )
if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR
"${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" )
diff --git a/GeoModelIO/GeoModelIOHelpers/CMakeLists.txt b/GeoModelIO/GeoModelIOHelpers/CMakeLists.txt
index ca1bb3fcd..72d6708c4 100644
--- a/GeoModelIO/GeoModelIOHelpers/CMakeLists.txt
+++ b/GeoModelIO/GeoModelIOHelpers/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
################################################################################
# Package: GeoModelIOHelpers
# author: Riccardo Maria BIANCHI <rbianchi@cern.ch> - 2023 Jan
@@ -16,7 +16,7 @@ target_link_libraries( GeoModelIOHelpers PUBLIC
# even if the latter is headers only
target_include_directories( GeoModelIOHelpers PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "GeoModelIOHelpers" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} )
set_target_properties( GeoModelIOHelpers PROPERTIES
diff --git a/GeoModelIO/GeoModelRead/CMakeLists.txt b/GeoModelIO/GeoModelRead/CMakeLists.txt
index 7a12ae38a..904b65979 100644
--- a/GeoModelIO/GeoModelRead/CMakeLists.txt
+++ b/GeoModelIO/GeoModelRead/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
################################################################################
# Package: GeoModelRead
# author: Riccardo Maria BIANCHI <rbianchi@cern.ch> - 2017
@@ -15,7 +15,7 @@ target_link_libraries( GeoModelRead PUBLIC
GeoModelKernel GeoModelDBManager TFPersistification )
target_include_directories( GeoModelRead PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "GeoModelRead" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} )
set_target_properties( GeoModelRead PROPERTIES
diff --git a/GeoModelIO/GeoModelWrite/CMakeLists.txt b/GeoModelIO/GeoModelWrite/CMakeLists.txt
index b29f91d60..ade59c69d 100644
--- a/GeoModelIO/GeoModelWrite/CMakeLists.txt
+++ b/GeoModelIO/GeoModelWrite/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cpp )
@@ -10,7 +10,7 @@ target_link_libraries( GeoModelWrite PUBLIC
GeoModelKernel GeoModelDBManager TFPersistification )
target_include_directories( GeoModelWrite PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "GeoModelWrite" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} )
set_target_properties( GeoModelWrite PROPERTIES
diff --git a/GeoModelIO/TFPersistification/CMakeLists.txt b/GeoModelIO/TFPersistification/CMakeLists.txt
index 0589986f4..85f185a09 100644
--- a/GeoModelIO/TFPersistification/CMakeLists.txt
+++ b/GeoModelIO/TFPersistification/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cpp )
@@ -10,7 +10,7 @@ target_link_libraries( TFPersistification PUBLIC
GeoGenericFunctions GeoModelKernel )
target_include_directories( TFPersistification PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "TFPersistification" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} )
set_target_properties( TFPersistification PROPERTIES
diff --git a/GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt b/GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt
index b3b922ecc..1792afc76 100644
--- a/GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt
+++ b/GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
@@ -6,10 +6,6 @@ file( GLOB SOURCES src/*.cxx )
# Create the library.
add_library( GMXPlugin SHARED ${SOURCES} )
target_link_libraries( GMXPlugin PUBLIC GeoModelCore::GeoModelKernel XercesC::XercesC GeoModelXml )
-target_include_directories( GMXPlugin PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
-source_group( "GMXPlugin" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} )
set_target_properties( GMXPlugin PROPERTIES
VERSION ${PROJECT_VERSION}
@@ -33,12 +29,3 @@ install(TARGETS GMXPlugin
COMPONENT Development
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
-
-install( FILES ${HEADERS}
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GMXPlugin
- COMPONENT Development )
-
-# set ( PLUGIN_NAME "GMXPlugin.so" )
-# ADD_CUSTOM_TARGET( GMX_plugin ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${GMXPlugin} ${PLUGIN_NAME} )
-
-
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt b/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
index 8e9375ae0..04e036d51 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
@@ -14,9 +14,9 @@ find_package( ZLIB REQUIRED )
add_library( GeoModelXml SHARED ${HEADERS} ${SOURCES} )
# link libraries
target_link_libraries( GeoModelXml PUBLIC GeoModelCore::GeoModelKernel GeoModelCore::GeoModelHelpers GeoModelTools::ExpressionEvaluator XercesC::XercesC PRIVATE ZLIB::ZLIB )
-target_include_directories( GeoModelXml PUBLIC
+target_include_directories( GeoModelXml PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "GeoModelXml" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} )
set_target_properties( GeoModelXml PROPERTIES
diff --git a/GeoModelVisualization/GXClashPointSystems/CMakeLists.txt b/GeoModelVisualization/GXClashPointSystems/CMakeLists.txt
index 33c91f302..733a2ff3c 100644
--- a/GeoModelVisualization/GXClashPointSystems/CMakeLists.txt
+++ b/GeoModelVisualization/GXClashPointSystems/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
@@ -12,7 +12,7 @@ target_link_libraries( GXClashPointSystems
PRIVATE Qt${QT_VERSION}::Core Qt${QT_VERSION}::Widgets nlohmann_json::nlohmann_json )
target_include_directories( GXClashPointSystems PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "GXClashPointSystems" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} ${UIS} ${RCS} )
set_target_properties( GXClashPointSystems PROPERTIES
diff --git a/GeoModelVisualization/GXHitDisplaySystems/CMakeLists.txt b/GeoModelVisualization/GXHitDisplaySystems/CMakeLists.txt
index e1e2c7d83..09d9d8a87 100644
--- a/GeoModelVisualization/GXHitDisplaySystems/CMakeLists.txt
+++ b/GeoModelVisualization/GXHitDisplaySystems/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
@@ -8,12 +8,12 @@ find_package (HDF5 REQUIRED)
# Add the library.
add_library( GXHitDisplaySystems SHARED ${SOURCES} ${HEADERS} ${UIS} )
target_link_libraries( GXHitDisplaySystems
- PUBLIC Coin::Coin GXBase
+ PUBLIC Coin::Coin GXBase
PRIVATE Qt${QT_VERSION}::Core Qt${QT_VERSION}::Widgets ${HDF5_CXX_LIBRARIES} ${HDF5_LIBRARIES} )
target_include_directories( GXHitDisplaySystems PUBLIC
- ${HDF5_CXX_INCLUDE_DIRS}
+ ${HDF5_CXX_INCLUDE_DIRS}
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "GXHitDisplaySystems" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} ${UIS} ${RCS} )
set_target_properties( GXHitDisplaySystems PROPERTIES
diff --git a/GeoModelVisualization/GXTrackDisplaySystems/CMakeLists.txt b/GeoModelVisualization/GXTrackDisplaySystems/CMakeLists.txt
index bc690cd32..690c605d6 100644
--- a/GeoModelVisualization/GXTrackDisplaySystems/CMakeLists.txt
+++ b/GeoModelVisualization/GXTrackDisplaySystems/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
@@ -8,12 +8,12 @@ file( GLOB UIS src/*.ui )
# Add the library.
add_library( GXTrackDisplaySystems SHARED ${SOURCES} ${HEADERS} ${UIS} )
target_link_libraries( GXTrackDisplaySystems
- PUBLIC Coin::Coin GXBase
+ PUBLIC Coin::Coin GXBase
PRIVATE Qt${QT_VERSION}::Core Qt${QT_VERSION}::Widgets ${HDF5_LIBRARIES} )
target_include_directories( GXTrackDisplaySystems PUBLIC
- ${HDF5_CXX_INCLUDE_DIRS}
+ ${HDF5_CXX_INCLUDE_DIRS}
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "GXTrackDisplaySystems" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} ${UIS} ${RCS} )
set_target_properties( GXTrackDisplaySystems PROPERTIES
diff --git a/GeoModelVisualization/VP1Base/CMakeLists.txt b/GeoModelVisualization/VP1Base/CMakeLists.txt
index ca2b6aba0..0118b8277 100644
--- a/GeoModelVisualization/VP1Base/CMakeLists.txt
+++ b/GeoModelVisualization/VP1Base/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
@@ -8,7 +8,7 @@ file( GLOB RCS src/*.qrc )
# Add the library.
add_library( GXBase SHARED ${SOURCES} ${HEADERS} ${UIS} ${RCS} )
-if (GEOMODEL_USE_QT6)
+if (GEOMODEL_USE_QT6)
target_link_libraries( GXBase
PUBLIC Coin::Coin Qt${QT_VERSION}::Core Qt${QT_VERSION}::Gui Qt${QT_VERSION}::Widgets Qt${QT_VERSION}::Core5Compat SoQt::SoQt
PRIVATE Qt${QT_VERSION}::PrintSupport Qt${QT_VERSION}::OpenGL GXHEPVis )
@@ -20,7 +20,7 @@ endif()
target_include_directories( GXBase PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
target_compile_definitions( GXBase PUBLIC
-DQT_NO_DEBUG_OUTPUT -DQT_NO_INFO_OUTPUT )
source_group( "VP1Base" FILES ${HEADERS} )
diff --git a/GeoModelVisualization/VP1GeometryPlugin/CMakeLists.txt b/GeoModelVisualization/VP1GeometryPlugin/CMakeLists.txt
index 488841c6c..052eb9156 100644
--- a/GeoModelVisualization/VP1GeometryPlugin/CMakeLists.txt
+++ b/GeoModelVisualization/VP1GeometryPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
@@ -11,7 +11,7 @@ target_link_libraries( GXGeometryPlugin
PRIVATE GXGeometrySystems GXGuideLineSystems GXClashPointSystems GXHitDisplaySystems GXTrackDisplaySystems)
target_include_directories( GXGeometryPlugin PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "VP1GeometryPlugin" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} ${UIS} )
diff --git a/GeoModelVisualization/VP1GeometrySystems/CMakeLists.txt b/GeoModelVisualization/VP1GeometrySystems/CMakeLists.txt
index a912560a3..c8c3eed5c 100644
--- a/GeoModelVisualization/VP1GeometrySystems/CMakeLists.txt
+++ b/GeoModelVisualization/VP1GeometrySystems/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
@@ -15,7 +15,7 @@ target_link_libraries( GXGeometrySystems
GeoModelIO::GeoModelWrite GeoModelIO::GeoModelDBManager GXHEPVis )
target_include_directories( GXGeometrySystems PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
target_compile_definitions( GXGeometrySystems PRIVATE
GEOMODEL_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" )
source_group( "VP1GeometrySystems" FILES ${HEADERS} )
diff --git a/GeoModelVisualization/VP1Gui/CMakeLists.txt b/GeoModelVisualization/VP1Gui/CMakeLists.txt
index 6cc53cc91..3fdcfe6a2 100644
--- a/GeoModelVisualization/VP1Gui/CMakeLists.txt
+++ b/GeoModelVisualization/VP1Gui/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
@@ -13,7 +13,7 @@ target_link_libraries( GXGui
PRIVATE Qt${QT_VERSION}::PrintSupport Qt${QT_VERSION}::OpenGL )
target_include_directories( GXGui PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "VP1Gui" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} ${UIS} ${RCS} )
set_target_properties( GXGui PROPERTIES
diff --git a/GeoModelVisualization/VP1GuideLineSystems/CMakeLists.txt b/GeoModelVisualization/VP1GuideLineSystems/CMakeLists.txt
index 100e56767..a9dbb0d75 100644
--- a/GeoModelVisualization/VP1GuideLineSystems/CMakeLists.txt
+++ b/GeoModelVisualization/VP1GuideLineSystems/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
@@ -12,7 +12,7 @@ target_link_libraries( GXGuideLineSystems
PRIVATE GeoModelCore::GeoModelKernel GXHEPVis )
target_include_directories( GXGuideLineSystems PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
source_group( "VP1GuideLineSystems" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} ${UIS} )
set_target_properties( GXGuideLineSystems PROPERTIES
diff --git a/GeoModelVisualization/VP1HEPVis/CMakeLists.txt b/GeoModelVisualization/VP1HEPVis/CMakeLists.txt
index d75338ba7..a512c64bf 100644
--- a/GeoModelVisualization/VP1HEPVis/CMakeLists.txt
+++ b/GeoModelVisualization/VP1HEPVis/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
@@ -8,7 +8,7 @@ file( GLOB HEADERS VP1HEPVis/*.h )
add_library( GXHEPVis SHARED ${SOURCES} ${HEADERS} )
target_include_directories( GXHEPVis PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include> )
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
target_link_libraries( GXHEPVis
PUBLIC Coin::Coin OpenGL::GL GeoModelCore::GeoModelKernel)
source_group( "VP1HEPVis" FILES ${HEADERS} )
diff --git a/athena_ci/apply_patches.sh b/athena_ci/apply_patches.sh
index 2582d3a4b..0a1ecd28b 100755
--- a/athena_ci/apply_patches.sh
+++ b/athena_ci/apply_patches.sh
@@ -25,14 +25,16 @@ fill_line "-"
git checkout $NIGHTLY_COMMIT
-for p in "$SCRIPT_DIR"/patches/*.patch; do
- echo "---- Applying ${p} ----"
- patch -p1 < ${p}
- #cat "${p}" | git am -3
- #git --no-pager log -1 $sha
-
- fill_line "-"
-done
+if compgen -G "${SCRIPT_DIR}/patches/*.patch" > /dev/null; then
+ for p in "$SCRIPT_DIR"/patches/*.patch; do
+ echo "---- Applying ${p} ----"
+ patch -p1 < ${p}
+ #cat "${p}" | git am -3
+ #git --no-pager log -1 $sha
+
+ fill_line "-"
+ done
+fi
#git diff HEAD ${NIGHTLY_COMMIT}
diff --git a/athena_ci/patches/0001-Adapt-to-interface-change-using-GeoPositioning-objec.patch b/athena_ci/patches/0001-Adapt-to-interface-change-using-GeoPositioning-objec.patch
deleted file mode 100644
index c5ee80b5c..000000000
--- a/athena_ci/patches/0001-Adapt-to-interface-change-using-GeoPositioning-objec.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2404442b4ba8f6dbc92f0b0f25e201317ec2c141 Mon Sep 17 00:00:00 2001
-From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
-Date: Tue, 30 Apr 2024 09:41:11 +0200
-Subject: [PATCH] Adapt to interface change using GeoPositioning objects
-
----
- .../GeoModelUtilities/GeoAlignmentStore.h | 14 +++++++-------
- .../GeoModelUtilities/src/GeoAlignmentStore.cxx | 4 ++--
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoAlignmentStore.h b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoAlignmentStore.h
-index 4756f948abc..da2b126bd4b 100755
---- a/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoAlignmentStore.h
-+++ b/DetectorDescription/GeoModel/GeoModelUtilities/GeoModelUtilities/GeoAlignmentStore.h
-@@ -49,19 +49,19 @@ public:
- /// full physical volume.
- /// @param fullPhysVol: Full physical volume in the GeoModel tree to which the transforms belongs to
- /// @param physVolTrf: Aligned placement of the physical volume in space
-- virtual void setAbsPosition(const GeoVFullPhysVol* fullPhysVol,
-+ virtual void setAbsPosition(const GeoNodePositioning* fullPhysVol,
- const GeoTrf::Transform3D& physVolTrf) override final;
- /// @brief: Returns the aligned transform associated with the full physical volume. Returns a
- /// nullptr if the physical volume has not been added before
-- virtual const GeoTrf::Transform3D* getAbsPosition(const GeoVFullPhysVol* fullPhysVol) const override final;
-+ virtual const GeoTrf::Transform3D* getAbsPosition(const GeoNodePositioning* fullPhysVol) const override final;
- /// @brief: Caches the aboslute transform of the perfectly aligned physical volume.
- /// @param fullPhysVol: Full physical volume in the GeoModel tree to which the transforms belongs to
- /// @param unAlignedTrf: Nominal placement of the full physical volume.
-- virtual void setDefAbsPosition(const GeoVFullPhysVol* fullPhysVol,
-+ virtual void setDefAbsPosition(const GeoNodePositioning* fullPhysVol,
- const GeoTrf::Transform3D& unAlignedTrf) override final;
- /// @brief: Returns the nominal position of the full phyiscal volume. Returns a nullptr if the
- /// nominal position of the full physical volume has not been added before to the map
-- virtual const GeoTrf::Transform3D* getDefAbsPosition(const GeoVFullPhysVol* fullPhysVol) const override final;
-+ virtual const GeoTrf::Transform3D* getDefAbsPosition(const GeoNodePositioning* fullPhysVol) const override final;
-
- /// @brief: Copies, the deltas, the absolute and the nominal positions of the other map
- /// to this object. Returns false if the two maps partially overlap.
-@@ -76,7 +76,7 @@ public:
- using DeltaMap = TransformMap<GeoAlignableTransform, GeoTrf::Transform3D>;
- using DeltaMapPtr = GeoModel::TransientConstSharedPtr<DeltaMap>;
-
-- using PositioningMap = TransformMap<GeoVFullPhysVol, GeoTrf::Transform3D>;
-+ using PositioningMap = TransformMap<GeoNodePositioning, GeoTrf::Transform3D>;
- using PositioningMapPtr = GeoModel::TransientConstSharedPtr<PositioningMap>;
- private:
- DeltaMapPtr m_deltas{std::make_unique<DeltaMap>()};
-@@ -92,10 +92,10 @@ public:
- inline const GeoTrf::Transform3D* GeoAlignmentStore::getDelta(const GeoAlignableTransform* axf) const {
- return m_deltas->getTransform(axf);
- }
--inline const GeoTrf::Transform3D* GeoAlignmentStore::getAbsPosition(const GeoVFullPhysVol* fpv) const {
-+inline const GeoTrf::Transform3D* GeoAlignmentStore::getAbsPosition(const GeoNodePositioning* fpv) const {
- return m_absPositions->getTransform(fpv);
- }
--inline const GeoTrf::Transform3D* GeoAlignmentStore::getDefAbsPosition(const GeoVFullPhysVol* fpv) const {
-+inline const GeoTrf::Transform3D* GeoAlignmentStore::getDefAbsPosition(const GeoNodePositioning* fpv) const {
- return m_defAbsPositions->getTransform(fpv);
- }
-
-diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoAlignmentStore.cxx b/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoAlignmentStore.cxx
-index f0865e42b55..b9282562062 100644
---- a/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoAlignmentStore.cxx
-+++ b/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoAlignmentStore.cxx
-@@ -11,10 +11,10 @@ void GeoAlignmentStore::setDelta(const GeoAlignableTransform* axf, const GeoTrf:
- void GeoAlignmentStore::setDelta(const GeoAlignableTransform* axf, std::shared_ptr<const GeoTrf::Transform3D> trans) {
- m_deltas->setTransform(axf, std::move(trans));
- }
--void GeoAlignmentStore::setAbsPosition(const GeoVFullPhysVol* fpv, const GeoTrf::Transform3D& xf) {
-+void GeoAlignmentStore::setAbsPosition(const GeoNodePositioning* fpv, const GeoTrf::Transform3D& xf) {
- m_absPositions->setTransform(fpv, xf);
- }
--void GeoAlignmentStore::setDefAbsPosition(const GeoVFullPhysVol* fpv, const GeoTrf::Transform3D& xf) {
-+void GeoAlignmentStore::setDefAbsPosition(const GeoNodePositioning* fpv, const GeoTrf::Transform3D& xf) {
- m_defAbsPositions->setTransform(fpv, xf);
- }
- void GeoAlignmentStore::lockDelta() {
---
-2.34.1
-
--
GitLab