diff --git a/Projects/AthSimulation/CMakeLists.txt b/Projects/AthSimulation/CMakeLists.txt index 88b4d21a38342d5604715293656ada6e1d95f18d..fc01c1d8aa7d82a093e38b60aa6f304d8701a046 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 6a201c5346f60ee4fc64c726dbcfd38da47a4f0c..f6a306b369d5a676079d409a6646c71fb2b03e0e 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 )