Skip to content
Snippets Groups Projects
Commit fe3b1907 authored by Johannes Junggeburth's avatar Johannes Junggeburth :dog2:
Browse files

Update 2 files

- /athena_ci/athena_build.sh
- /GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVPhysVol.h
parent eb4c5c0d
No related branches found
No related tags found
1 merge request!323Attempt to fix the pipeline -- Another one
...@@ -35,6 +35,7 @@ class GeoVPhysVol: public GeoPlacement { ...@@ -35,6 +35,7 @@ class GeoVPhysVol: public GeoPlacement {
Query<unsigned int> indexOf(PVConstLink daughter) const; Query<unsigned int> indexOf(PVConstLink daughter) const;
/// Returns the logical volume. /// Returns the logical volume.
[[deprecated]]
const GeoLogVol* getLogVol() const { const GeoLogVol* getLogVol() const {
return m_logVol; return m_logVol;
} }
......
...@@ -206,7 +206,7 @@ export ROOT_INCLUDE_PATH="${gm_install_dir}/include:${ROOT_INCLUDE_PATH}" ...@@ -206,7 +206,7 @@ export ROOT_INCLUDE_PATH="${gm_install_dir}/include:${ROOT_INCLUDE_PATH}"
cmake "$ATHENA_SOURCE/Projects/WorkDir" \ cmake "$ATHENA_SOURCE/Projects/WorkDir" \
-GNinja \ -GNinja \
-DCMAKE_MAKE_PROGRAM="$NINJA" \ -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" \ -DATLAS_PACKAGE_FILTER_FILE="$package_filters" \
-DCMAKE_CXX_COMPILER_LAUNCHER=$CCACHE \ -DCMAKE_CXX_COMPILER_LAUNCHER=$CCACHE \
-DCMAKE_INSTALL_PREFIX=$install_dir -DCMAKE_INSTALL_PREFIX=$install_dir
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment