[Cmake-commits] CMake branch, master, updated. v3.8.1-1336-gd375618
Kitware Robot
kwrobot at kitware.com
Sun May 28 09:25:02 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via d375618921e16c229e748c87ea16190f2de74337 (commit)
via ff1563199cfa36fca21889fce8a6b89bcb7db241 (commit)
via 370d0d25315cc2fae38e1c6397b0094d43384c16 (commit)
via f1f21e3077cd6f1519d9a2b50e211b4c233d12cd (commit)
via 9316120c80119c64a8d201bd70d7c58852ff6d7e (commit)
via 783fbb77e7b48d5816f16773f977250453cd43ee (commit)
via fc51b92c802f64dc028cf99f4caa879b1571773a (commit)
from f8642f953d3d8547bd31fcb35a4737fa91d9126f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d375618921e16c229e748c87ea16190f2de74337
commit d375618921e16c229e748c87ea16190f2de74337
Merge: ff15631 370d0d2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun May 28 13:22:29 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun May 28 09:22:33 2017 -0400
Merge topic 'sunpro-std-flags'
370d0d25 SunPro: update flags used for CMake itself
f1f21e30 SunPro: set -library=stlport as standard compile option for C++98
9316120c SunPro: add standard compile option for C++03
783fbb77 Tests: Compile entire Plugin test with the same language standard
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !879
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff1563199cfa36fca21889fce8a6b89bcb7db241
commit ff1563199cfa36fca21889fce8a6b89bcb7db241
Merge: f8642f9 fc51b92
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun May 28 13:21:40 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun May 28 09:21:43 2017 -0400
Merge topic 'intel-std-flags'
fc51b92c Intel: avoid variables in language standard flags
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !894
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=370d0d25315cc2fae38e1c6397b0094d43384c16
commit 370d0d25315cc2fae38e1c6397b0094d43384c16
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Mon May 22 23:28:51 2017 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 26 13:26:40 2017 -0400
SunPro: update flags used for CMake itself
Special flags should no longer be required when CMake is built with a
recent version of CMake.
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index d1f4f13..7a9d4cd 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -59,7 +59,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^parisc")
endif()
endif()
-if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
+if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro AND
+ NOT DEFINED CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION)
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD EQUAL 98)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1f21e3077cd6f1519d9a2b50e211b4c233d12cd
commit f1f21e3077cd6f1519d9a2b50e211b4c233d12cd
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Mon May 22 23:22:59 2017 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 26 13:26:39 2017 -0400
SunPro: set -library=stlport as standard compile option for C++98
diff --git a/Modules/Compiler/SunPro-CXX.cmake b/Modules/Compiler/SunPro-CXX.cmake
index f8030f1..4b0a21d 100644
--- a/Modules/Compiler/SunPro-CXX.cmake
+++ b/Modules/Compiler/SunPro-CXX.cmake
@@ -42,6 +42,10 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
set(CMAKE_CXX_LINK_WITH_STANDARD_COMPILE_OPTION 1)
+else()
+ set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-library=stlport")
+ set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-library=stlport")
+ set(CMAKE_CXX_LINK_WITH_STANDARD_COMPILE_OPTION 1)
endif()
__compiler_check_default_language_standard(CXX 5.13 98)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9316120c80119c64a8d201bd70d7c58852ff6d7e
commit 9316120c80119c64a8d201bd70d7c58852ff6d7e
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri May 19 15:01:38 2017 -0600
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 26 13:26:39 2017 -0400
SunPro: add standard compile option for C++03
diff --git a/Modules/Compiler/SunPro-CXX.cmake b/Modules/Compiler/SunPro-CXX.cmake
index 5db7987..f8030f1 100644
--- a/Modules/Compiler/SunPro-CXX.cmake
+++ b/Modules/Compiler/SunPro-CXX.cmake
@@ -37,8 +37,8 @@ set(CMAKE_CXX_CREATE_STATIC_LIBRARY
"<CMAKE_RANLIB> <TARGET> ")
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
- set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "")
- set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "")
+ set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++03")
+ set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=c++03")
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
set(CMAKE_CXX_LINK_WITH_STANDARD_COMPILE_OPTION 1)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=783fbb77e7b48d5816f16773f977250453cd43ee
commit 783fbb77e7b48d5816f16773f977250453cd43ee
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 26 13:25:11 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 26 13:26:39 2017 -0400
Tests: Compile entire Plugin test with the same language standard
Set `CMAKE_CXX_STANDARD` early so that both KWSys and our test code
build with the same language standard. This is important on compilers
that have incompatible standard libraries.
diff --git a/Tests/Plugin/CMakeLists.txt b/Tests/Plugin/CMakeLists.txt
index f52b479..9e2b4ab 100644
--- a/Tests/Plugin/CMakeLists.txt
+++ b/Tests/Plugin/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required (VERSION 2.6)
cmake_policy(SET CMP0054 NEW)
project(Plugin)
+# We need proper C++98 support from the compiler
+set(CMAKE_CXX_STANDARD 98)
+
# Test per-target output directory properties.
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${Plugin_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${Plugin_BINARY_DIR}/lib/plugin)
@@ -25,9 +28,6 @@ include_directories(
${Plugin_SOURCE_DIR}/include
)
-# We need proper C++98 support from the compiler
-set(CMAKE_CXX_STANDARD 98)
-
# Those versions of the HP compiler that need a flag to get proper C++98
# template support also need a flag to use the newer C++ library.
if (CMAKE_CXX_COMPILER_ID STREQUAL HP AND
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc51b92c802f64dc028cf99f4caa879b1571773a
commit fc51b92c802f64dc028cf99f4caa879b1571773a
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri May 26 00:20:34 2017 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Fri May 26 08:21:50 2017 +0200
Intel: avoid variables in language standard flags
In the bootstrap script, we want to be able to extract language standard
flags using sed. Make sure the content of the flag varianbles can be
passed unmodified to the compiler.
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index d583dba..20e29e2 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -8,30 +8,34 @@ string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -DNDEBUG")
set(CMAKE_DEPFILE_FLAGS_C "-MD -MT <OBJECT> -MF <DEPFILE>")
if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC")
- set(_std -Qstd)
- set(_ext c)
+
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 16.0.0)
set(CMAKE_C11_STANDARD_COMPILE_OPTION "-Qstd=c11")
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-Qstd=c11")
endif()
+
+ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
+ set(CMAKE_C90_STANDARD_COMPILE_OPTION "-Qstd=c89")
+ set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-Qstd=c89")
+ set(CMAKE_C99_STANDARD_COMPILE_OPTION "-Qstd=c99")
+ set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-Qstd=c99")
+ endif()
+
else()
- set(_std -std)
- set(_ext gnu)
+
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
set(CMAKE_C11_STANDARD_COMPILE_OPTION "-std=c11")
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11")
endif()
-endif()
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
- set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89")
- set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=${_ext}89")
- set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99")
- set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=${_ext}99")
-endif()
+ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
+ set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89")
+ set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu89")
+ set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99")
+ set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99")
+ endif()
-unset(_std)
-unset(_ext)
+endif()
__compiler_check_default_language_standard(C 12.1 90 15.0.0 11)
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 4aef30a..08d23fc 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -8,16 +8,27 @@ string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -DNDEBUG")
set(CMAKE_DEPFILE_FLAGS_CXX "-MD -MT <OBJECT> -MF <DEPFILE>")
if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
- set(_std -Qstd)
- set(_ext c++)
+
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0)
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-Qstd=c++14")
- # todo: there is no gnu++14 value supported; figure out what to do
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-Qstd=c++14")
endif()
+
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
+ set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-Qstd=c++11")
+ set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-Qstd=c++11")
+ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
+ set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-Qstd=c++0x")
+ set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-Qstd=c++0x")
+ endif()
+
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
+ set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "")
+ set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "")
+ endif()
+
else()
- set(_std -std)
- set(_ext gnu++)
+
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.2)
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
# todo: there is no gnu++14 value supported; figure out what to do
@@ -27,28 +38,21 @@ else()
# todo: there is no gnu++14 value supported; figure out what to do
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=c++1y")
endif()
-endif()
-if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
- set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "${_std}=c++11")
- set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "${_std}=${_ext}11")
-elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
- set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "${_std}=c++0x")
- set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "${_std}=${_ext}0x")
-endif()
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
+ set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
+ set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
+ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
+ set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++0x")
+ set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x")
+ endif()
-if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
- if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
- set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "")
- set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "")
- else()
- set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=c++98")
- set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "${_std}=gnu++98")
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
+ set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++98")
+ set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=gnu++98")
endif()
-endif()
-unset(_std)
-unset(_ext)
+endif()
__compiler_check_default_language_standard(CXX 12.1 98)
-----------------------------------------------------------------------
Summary of changes:
CompileFlags.cmake | 3 ++-
Modules/Compiler/Intel-C.cmake | 30 ++++++++++++----------
Modules/Compiler/Intel-CXX.cmake | 50 ++++++++++++++++++++-----------------
Modules/Compiler/SunPro-CXX.cmake | 8 ++++--
Tests/Plugin/CMakeLists.txt | 6 ++---
5 files changed, 55 insertions(+), 42 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list