Skip to content
Snippets Groups Projects
Commit a27d713b authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

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.
parent f5ac4bd9
No related branches found
No related tags found
No related merge requests found
# The minimum required CMake version: # 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 # Read in the project's version from a file called version.txt. But let it be
# overridden from the command line if necessary. # overridden from the command line if necessary.
...@@ -33,7 +33,7 @@ foreach( _external ${_externals} ) ...@@ -33,7 +33,7 @@ foreach( _external ${_externals} )
include( ${_external} ) include( ${_external} )
get_filename_component( _extName ${_external} NAME_WE ) get_filename_component( _extName ${_external} NAME_WE )
string( TOUPPER ${_extName} _extNameUpper ) string( TOUPPER ${_extName} _extNameUpper )
message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_ROOT}" ) message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" )
unset( _extName ) unset( _extName )
unset( _extNameUpper ) unset( _extNameUpper )
endforeach() endforeach()
...@@ -45,7 +45,7 @@ atlas_ctest_setup() ...@@ -45,7 +45,7 @@ atlas_ctest_setup()
# Declare project name and version # Declare project name and version
atlas_project( AthSimulation ${ATHSIMULATION_PROJECT_VERSION} atlas_project( AthSimulation ${ATHSIMULATION_PROJECT_VERSION}
USE AthSimulationExternals 0.0.1 USE AthSimulationExternals ${AthSimulationExternals_VERSION}
PROJECT_ROOT ${CMAKE_SOURCE_DIR}/../../ PROJECT_ROOT ${CMAKE_SOURCE_DIR}/../../
FORTRAN ) FORTRAN )
......
...@@ -4,7 +4,11 @@ ...@@ -4,7 +4,11 @@
# #
# Find Gaudi: # 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: # Temporarily setting additional compile flags here:
add_definitions( -DSIMULATIONBASE ) add_definitions( -DSIMULATIONBASE )
...@@ -21,7 +25,7 @@ foreach( _external ${_externals} ) ...@@ -21,7 +25,7 @@ foreach( _external ${_externals} )
get_filename_component( _extName ${_external} NAME_WE ) get_filename_component( _extName ${_external} NAME_WE )
string( TOUPPER ${_extName} _extNameUpper ) string( TOUPPER ${_extName} _extNameUpper )
if( NOT AthSimulation_FIND_QUIETLY ) if( NOT AthSimulation_FIND_QUIETLY )
message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_ROOT}" ) message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" )
endif() endif()
unset( _extName ) unset( _extName )
unset( _extNameUpper ) unset( _extNameUpper )
......
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