From bba1cc90a11666de836e332cf98bb451ca82426b Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <krasznaa@cern.ch>
Date: Thu, 16 Jun 2016 15:10:21 +0200
Subject: [PATCH] Renaming CentOS builds from cc7 to centos7
(AtlasCMake-00-01-57)
* Changed the "short name" of CentOS to "centos" from the
previous "cc". As that's the new SFT convention.
* Tagging as AtlasCMake-00-01-57
2016-06-15 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
* Removed the debugging message that I left in FindGaudi.cmake,
while debugging why it wasn't picking up the right RPM version
in the nightly. It wasn't causing any problems, was just printing
an annoying message. (Which was highlighted a lot more by
QtCreator.)
* Tagging as AtlasCMake-00-01-56
2016-06-13 Stewart Martin-Haugh <smh@cern.ch>
* Remove build flags already part of the C++14 standard (ATR-1086)
* Tagging as AtlasCMake-00-01-55
Former-commit-id: 0a2a973a0bdfa14baf892f519f578e07d477e40d
---
.../modules/AtlasCompilerSettings.cmake | 20 ++-----------------
Build/AtlasCMake/modules/AtlasInternals.cmake | 4 ++--
Build/AtlasCMake/modules/FindGaudi.cmake | 3 +--
3 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake b/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake
index c62e29c87d2..a233ed30cc3 100644
--- a/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake
+++ b/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-# $Id: AtlasCompilerSettings.cmake 744652 2016-05-03 19:40:31Z krasznaa $
+# $Id: AtlasCompilerSettings.cmake 754486 2016-06-13 13:31:01Z smh $
#
# This file collects settings fine-tuning all the compiler and linker options
# used in an ATLAS build in one place. It is included by default when using
@@ -29,16 +29,7 @@ set( CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard used for the build" )
set( CMAKE_CXX_EXTENSIONS FALSE CACHE BOOL "(Dis)allow using GNU extensions" )
# Set the definitions needed everywhere:
-add_definitions( -DHAVE_PRETTY_FUNCTION
- -DHAVE_EXPLICIT -DHAVE_MUTABLE -DHAVE_SIGNED -DHAVE_TYPENAME
- -DHAVE_NEW_STYLE_CASTS -DHAVE_DYNAMIC_CAST -DHAVE_TYPEID
- -DHAVE_ANSI_TEMPLATE_INSTANTIATION -DHAVE_TEMPLATE_DEFAULT_ARGS
- -DHAVE_BROKEN_TEMPLATE_RESCOPE -DHAVE_TEMPLATE_NULL_ARGS
- -DHAVE_TEMPLATE_NULL_SPEC -DHAVE_TEMPLATE_PARTIAL_SPEC
- -DHAVE_MEMBER_TEMPLATES -DHAVE_ANSI_OPERATOR_ARROW
- -DHAVE_NAMESPACES -DHAVE_NAMESPACE_STD
- -DHAVE_OSTREAM_CHAR_OVERLOAD -DHAVE_ITERATOR_TRAITS -DHAVE_ITERATOR
- -DHAVE_REVERSE_ITERATOR_STYLE -DHAVE_CXX_STDC_HEADERS )
+add_definitions( -DHAVE_PRETTY_FUNCTION )
# Function helping with setting up variable type checks
function( _check_for_type typeName definition )
@@ -48,10 +39,6 @@ function( _check_for_type typeName definition )
endif()
endfunction( _check_for_type )
-# Check for various C++ types:
-_check_for_type( "long long" LONG_LONG )
-_check_for_type( "bool" BOOL )
-
# Function helping with setting up header checks
function( _check_for_include include definition )
check_include_file_cxx( ${include} ${definition} )
@@ -60,9 +47,6 @@ function( _check_for_include include definition )
endif()
endfunction( _check_for_include )
-# Check for various C++ includes:
-_check_for_include( "iostream" HAVE_NEW_IOSTREAMS )
-
# Clean up:
unset( _check_for_type )
unset( _check_for_include )
diff --git a/Build/AtlasCMake/modules/AtlasInternals.cmake b/Build/AtlasCMake/modules/AtlasInternals.cmake
index e2c65590389..97b82a29078 100644
--- a/Build/AtlasCMake/modules/AtlasInternals.cmake
+++ b/Build/AtlasCMake/modules/AtlasInternals.cmake
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-# $Id: AtlasInternals.cmake 751680 2016-06-02 08:25:55Z krasznaa $
+# $Id: AtlasInternals.cmake 755445 2016-06-16 15:09:56Z krasznaa $
#
# Functions used internally by functions declared in AtlasFunctions.
# Which are for general use inside the package descriptions.
@@ -241,7 +241,7 @@ function( atlas_os_id os isValid )
elseif( _linuxId MATCHES "Ubuntu" )
set( _linuxShort "ubuntu" )
elseif( _linuxId MATCHES "CentOS" )
- set( _linuxShort "cc" )
+ set( _linuxShort "centos" )
else()
message( WARNING "Linux flavour not recognised" )
set( _linuxShort "linux" )
diff --git a/Build/AtlasCMake/modules/FindGaudi.cmake b/Build/AtlasCMake/modules/FindGaudi.cmake
index 67ab62aa24a..3996e5c9c25 100644
--- a/Build/AtlasCMake/modules/FindGaudi.cmake
+++ b/Build/AtlasCMake/modules/FindGaudi.cmake
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-# $Id: FindGaudi.cmake 753396 2016-06-07 15:36:05Z krasznaa $
+# $Id: FindGaudi.cmake 755055 2016-06-15 15:07:02Z krasznaa $
#
# CMake script attempting to find a Gaudi installation that we can build
# the offline code against. Without making any use of the CMake code
@@ -137,5 +137,4 @@ else()
endif()
set_property( GLOBAL APPEND PROPERTY ATLAS_EXTERNAL_RPMS
"GAUDI_${version}_${ATLAS_PLATFORM}" )
-message( "Added dependency: GAUDI_${version}_${ATLAS_PLATFORM}" )
unset( version )
--
GitLab