From a27d713b572619ddd5b0e8925b6983af8d0c5b60 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Fri, 25 Jan 2019 09:53:47 +0100
Subject: [PATCH] Updated some more code in the AthSimulation project to use
the new variable naming scheme.
Just like in the Athena project, I also forgot to update some non-essential code pieces
in the AthSimulation project.
---
Projects/AthSimulation/CMakeLists.txt | 6 +++---
Projects/AthSimulation/PostConfig.cmake.in | 8 ++++++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Projects/AthSimulation/CMakeLists.txt b/Projects/AthSimulation/CMakeLists.txt
index 88b4d21a383..fc01c1d8aa7 100644
--- a/Projects/AthSimulation/CMakeLists.txt
+++ b/Projects/AthSimulation/CMakeLists.txt
@@ -1,6 +1,6 @@
# The minimum required CMake version:
-cmake_minimum_required( VERSION 3.2 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.6 )
# Read in the project's version from a file called version.txt. But let it be
# overridden from the command line if necessary.
@@ -33,7 +33,7 @@ foreach( _external ${_externals} )
include( ${_external} )
get_filename_component( _extName ${_external} NAME_WE )
string( TOUPPER ${_extName} _extNameUpper )
- message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_ROOT}" )
+ message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" )
unset( _extName )
unset( _extNameUpper )
endforeach()
@@ -45,7 +45,7 @@ atlas_ctest_setup()
# Declare project name and version
atlas_project( AthSimulation ${ATHSIMULATION_PROJECT_VERSION}
- USE AthSimulationExternals 0.0.1
+ USE AthSimulationExternals ${AthSimulationExternals_VERSION}
PROJECT_ROOT ${CMAKE_SOURCE_DIR}/../../
FORTRAN )
diff --git a/Projects/AthSimulation/PostConfig.cmake.in b/Projects/AthSimulation/PostConfig.cmake.in
index 6a201c5346f..f6a306b369d 100644
--- a/Projects/AthSimulation/PostConfig.cmake.in
+++ b/Projects/AthSimulation/PostConfig.cmake.in
@@ -4,7 +4,11 @@
#
# Find Gaudi:
-find_package( Gaudi REQUIRED )
+if( AthSimulation_FIND_QUIETLY )
+ find_package( Gaudi REQUIRED QUIET )
+else()
+ find_package( Gaudi REQUIRED )
+endif()
# Temporarily setting additional compile flags here:
add_definitions( -DSIMULATIONBASE )
@@ -21,7 +25,7 @@ foreach( _external ${_externals} )
get_filename_component( _extName ${_external} NAME_WE )
string( TOUPPER ${_extName} _extNameUpper )
if( NOT AthSimulation_FIND_QUIETLY )
- message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_ROOT}" )
+ message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" )
endif()
unset( _extName )
unset( _extNameUpper )
--
GitLab