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

Merge branch 'PlatformHandlingFix-1.0-20180621' into '1.0'

ATLAS_PLATFORM Handling Update, 1.0 branch (2018.06.21.)

See merge request atlas/atlasexternals!317
parents a561d881 8ed2651b
No related branches found
No related tags found
No related merge requests found
......@@ -171,12 +171,15 @@ function( atlas_project name version )
"No explicit build type requested, using \"Default\" build" )
endif()
# Construct a platform name:
# Construct a platform name. In a slightly more complicated way than in the
# past. Allowing the users to override the name selected automatically, using
# the ATLAS_FORCE_PLATFORM cache variable.
atlas_platform_id( _platform )
set( ATLAS_PLATFORM ${_platform} CACHE STRING
set( ATLAS_FORCE_PLATFORM ${_platform} CACHE STRING
"Build platform of the project" )
set( BUILDNAME ${_platform} CACHE STRING
"Build platform for CDash" )
set( BUILDNAME ${ATLAS_FORCE_PLATFORM} CACHE STRING
"Build platform for CDash" FORCE )
set( ATLAS_PLATFORM ${ATLAS_FORCE_PLATFORM} )
message( STATUS "Using platform name: ${ATLAS_PLATFORM}" )
# Set a default installation path. One that RPM making works with:
......@@ -371,8 +374,7 @@ function( atlas_project name version )
# Reset the platform name, as the base projects may use a different one than
# the one used for this project.
set( ATLAS_PLATFORM ${_platform} )
set( BUILDNAME ${_platform} )
set( ATLAS_PLATFORM ${ATLAS_FORCE_PLATFORM} )
# Set the ATLAS_BASE_PROJECTS variable in the parent scope. To be able to
# use it in the CPack configuration:
......@@ -466,9 +468,8 @@ function( atlas_project name version )
# Reset the platform name, as the base projects may use a different one than
# the one used for this project.
set( ATLAS_PLATFORM ${_platform} )
set( ATLAS_PLATFORM ${_platform} PARENT_SCOPE )
set( BUILDNAME ${_platform} )
set( ATLAS_PLATFORM ${ATLAS_FORCE_PLATFORM} )
set( ATLAS_PLATFORM ${ATLAS_FORCE_PLATFORM} PARENT_SCOPE )
# Start constructing the files for the sub-project setup:
get_property( _compiledPackages GLOBAL PROPERTY
......
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