From fe3b190756d101e0616a518b80b36fa6d7d7781f Mon Sep 17 00:00:00 2001 From: Johannes Junggeburth <johannes.josef.junggeburth@cern.ch> Date: Fri, 17 May 2024 16:18:14 +0200 Subject: [PATCH] Update 2 files - /athena_ci/athena_build.sh - /GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVPhysVol.h --- GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVPhysVol.h | 1 + athena_ci/athena_build.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVPhysVol.h b/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVPhysVol.h index daa7945c4..c5556fe80 100644 --- a/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVPhysVol.h +++ b/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVPhysVol.h @@ -35,6 +35,7 @@ class GeoVPhysVol: public GeoPlacement { Query<unsigned int> indexOf(PVConstLink daughter) const; /// Returns the logical volume. + [[deprecated]] const GeoLogVol* getLogVol() const { return m_logVol; } diff --git a/athena_ci/athena_build.sh b/athena_ci/athena_build.sh index 220a60ad0..c64bbb384 100755 --- a/athena_ci/athena_build.sh +++ b/athena_ci/athena_build.sh @@ -206,7 +206,7 @@ export ROOT_INCLUDE_PATH="${gm_install_dir}/include:${ROOT_INCLUDE_PATH}" cmake "$ATHENA_SOURCE/Projects/WorkDir" \ -GNinja \ -DCMAKE_MAKE_PROGRAM="$NINJA" \ - -DCMAKE_CXX_FLAGS="$EXTRA_FLAGS -isystem ${gm_install_dir}/include" \ + -DCMAKE_CPP_FLAGS="$EXTRA_FLAGS -isystem ${gm_install_dir}/include" \ -DATLAS_PACKAGE_FILTER_FILE="$package_filters" \ -DCMAKE_CXX_COMPILER_LAUNCHER=$CCACHE \ -DCMAKE_INSTALL_PREFIX=$install_dir -- GitLab