[Cmake-commits] CMake branch, master, updated. v3.8.1-1099-gb69e061
Kitware Robot
kwrobot at kitware.com
Tue May 9 11:45:03 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 b69e061b8073efbd2c356f4508ea401c85e8dae3 (commit)
via fcf60ec1bcb0fa3224bfe80f8279c29670cefd19 (commit)
via 59f844521912605b16183da300ab98ad029ca06d (commit)
via 2731a91c98ad8b48aaecc2fa3039cc9601d48fbc (commit)
via 86edc5b6a5f9ef74d8807a6b90d209cce4e3a2d7 (commit)
via 7b2d529bdef9f6a5fa2bc3665a6b88cf52b110e1 (commit)
from 1019789f2aadce6896182c1696aabf883dce4905 (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=b69e061b8073efbd2c356f4508ea401c85e8dae3
commit b69e061b8073efbd2c356f4508ea401c85e8dae3
Merge: fcf60ec 2731a91
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 9 15:37:33 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 9 11:37:35 2017 -0400
Merge topic 'suncc-cxx11'
2731a91c Update SunPro flags used for CMake itself to support C++11
86edc5b6 Choose compiler-specific flags earlier in CMake's own build
7b2d529b cmBase32: Cast pointer subtraction result to size explicitly
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !813
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcf60ec1bcb0fa3224bfe80f8279c29670cefd19
commit fcf60ec1bcb0fa3224bfe80f8279c29670cefd19
Merge: 1019789 59f8445
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 9 15:37:08 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 9 11:37:15 2017 -0400
Merge topic 'test-macos-framework-type-universal-binary'
59f84452 Tests: Fix RunCMake.Framework expectation for universal binaries
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !814
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59f844521912605b16183da300ab98ad029ca06d
commit 59f844521912605b16183da300ab98ad029ca06d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 8 11:30:21 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 8 11:38:23 2017 -0400
Tests: Fix RunCMake.Framework expectation for universal binaries
While at it, replace `\n` in with a real newline because such escape
sequences are not processed in this context.
diff --git a/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
index 8d90f5f..f664db9 100644
--- a/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
+++ b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
@@ -1 +1,3 @@
-.*/Framework: Mach-O[^\n]* dynamically linked shared library.*
+.*/Framework:( Mach-O universal binary with [^
+]*)? Mach-O[^
+]* dynamically linked shared library.*
diff --git a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
index c9f50b6..532cfed 100644
--- a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
+++ b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
@@ -1 +1,2 @@
-.*/Framework: current ar archive random library.*
+.*/Framework:( Mach-O universal binary with [^
+]*)? current ar archive random library.*
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2731a91c98ad8b48aaecc2fa3039cc9601d48fbc
commit 2731a91c98ad8b48aaecc2fa3039cc9601d48fbc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 8 10:26:54 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 8 10:53:46 2017 -0400
Update SunPro flags used for CMake itself to support C++11
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b88538..eb46c3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,11 +55,15 @@ if(NOT DEFINED CMAKE_C_STANDARD AND NOT CMake_NO_C_STANDARD)
endif()
endif()
if(NOT DEFINED CMAKE_CXX_STANDARD AND NOT CMake_NO_CXX_STANDARD)
- include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx14_cstdio.cmake)
- if(NOT CMake_CXX14_CSTDIO_BROKEN)
- set(CMAKE_CXX_STANDARD 14)
+ if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.14)
+ set(CMAKE_CXX_STANDARD 98)
else()
- set(CMAKE_CXX_STANDARD 11)
+ include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx14_cstdio.cmake)
+ if(NOT CMake_CXX14_CSTDIO_BROKEN)
+ set(CMAKE_CXX_STANDARD 14)
+ else()
+ set(CMAKE_CXX_STANDARD 11)
+ endif()
endif()
endif()
if(NOT CMake_TEST_EXTERNAL_CMAKE)
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index d70e3af..d1f4f13 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -61,7 +61,14 @@ endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
+ if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD EQUAL 98)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
+ elseif(CMAKE_VERSION VERSION_LESS 3.8.20170502)
+ # CMake knows how to add this flag for compilation as C++11,
+ # but has not been taught that SunPro needs it for linking too.
+ # Add it in a place that will be used for both.
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86edc5b6a5f9ef74d8807a6b90d209cce4e3a2d7
commit 86edc5b6a5f9ef74d8807a6b90d209cce4e3a2d7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 8 10:26:48 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 8 10:26:48 2017 -0400
Choose compiler-specific flags earlier in CMake's own build
Add the flags early enough be used in the checks for C++ features.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dcf2f0..6b88538 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,10 @@ if(NOT DEFINED CMAKE_CXX_STANDARD AND NOT CMake_NO_CXX_STANDARD)
endif()
endif()
if(NOT CMake_TEST_EXTERNAL_CMAKE)
+ # include special compile flags for some compilers
+ include(CompileFlags.cmake)
+
+ # check for available C++ features
include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx_features.cmake)
endif()
@@ -648,9 +652,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
include(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake)
endif()
- # include special compile flags for some compilers
- include(CompileFlags.cmake)
-
# no clue why we are testing for this here
include(CheckSymbolExists)
CHECK_SYMBOL_EXISTS(unsetenv "stdlib.h" HAVE_UNSETENV)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b2d529bdef9f6a5fa2bc3665a6b88cf52b110e1
commit 7b2d529bdef9f6a5fa2bc3665a6b88cf52b110e1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 8 10:26:36 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 8 10:26:36 2017 -0400
cmBase32: Cast pointer subtraction result to size explicitly
The SunPro 5.13 compiler with `-std=c++11` complains otherwise.
diff --git a/Source/cmBase32.cxx b/Source/cmBase32.cxx
index 091d619..1dac212 100644
--- a/Source/cmBase32.cxx
+++ b/Source/cmBase32.cxx
@@ -58,7 +58,7 @@ std::string cmBase32Encoder::encodeString(const unsigned char* input,
input += blockSize;
}
- size_t remain(end - input);
+ size_t remain = static_cast<size_t>(end - input);
if (remain != 0) {
// Temporary source buffer filled up with 0s
unsigned char extended[blockSize];
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 19 ++++++++++++-------
CompileFlags.cmake | 9 ++++++++-
Source/cmBase32.cxx | 2 +-
.../Framework/FrameworkTypeSHARED-build-stdout.txt | 4 +++-
.../Framework/FrameworkTypeSTATIC-build-stdout.txt | 3 ++-
5 files changed, 26 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list