[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5576-ga222298
Stephen Kelly
steveire at gmail.com
Thu Nov 21 04:47:22 EST 2013
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, next has been updated
via a222298833559bcb309bcfe49346c024284165a5 (commit)
via 5d09f14b5f87dad7459fd7061a33f32d95fb818e (commit)
from 3bac6b9b3696c40f37f9c6e2c825d517261c38dd (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a222298833559bcb309bcfe49346c024284165a5
commit a222298833559bcb309bcfe49346c024284165a5
Merge: 3bac6b9 5d09f14
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 21 04:47:20 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 21 04:47:20 2013 -0500
Merge topic 'target_compile_features' into next
5d09f14 Record standard of features, if applicable.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d09f14b5f87dad7459fd7061a33f32d95fb818e
commit 5d09f14b5f87dad7459fd7061a33f32d95fb818e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 21 10:45:39 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 21 10:45:39 2013 +0100
Record standard of features, if applicable.
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in
index 59d88fb..804cce2 100644
--- a/Modules/CMakeCCompiler.cmake.in
+++ b/Modules/CMakeCCompiler.cmake.in
@@ -2,7 +2,6 @@ set(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@")
set(CMAKE_C_COMPILER_ARG1 "@CMAKE_C_COMPILER_ARG1@")
set(CMAKE_C_COMPILER_ID "@CMAKE_C_COMPILER_ID@")
set(CMAKE_C_COMPILER_VERSION "@CMAKE_C_COMPILER_VERSION@")
-set(CMAKE_C_COMPILE_FEATURES "@CMAKE_C_COMPILE_FEATURES@")
set(CMAKE_C_PLATFORM_ID "@CMAKE_C_PLATFORM_ID@")
set(CMAKE_C_SIMULATE_ID "@CMAKE_C_SIMULATE_ID@")
set(CMAKE_C_SIMULATE_VERSION "@CMAKE_C_SIMULATE_VERSION@")
diff --git a/Modules/CMakeCXXCompiler.cmake.in b/Modules/CMakeCXXCompiler.cmake.in
index f638147..28bd1cf 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -3,6 +3,10 @@ set(CMAKE_CXX_COMPILER_ARG1 "@CMAKE_CXX_COMPILER_ARG1@")
set(CMAKE_CXX_COMPILER_ID "@CMAKE_CXX_COMPILER_ID@")
set(CMAKE_CXX_COMPILER_VERSION "@CMAKE_CXX_COMPILER_VERSION@")
set(CMAKE_CXX_COMPILE_FEATURES "@CMAKE_CXX_COMPILE_FEATURES@")
+set(CMAKE_CXX98_COMPILE_EXTENSIONS "@CMAKE_CXX98_COMPILE_EXTENSIONS@")
+set(CMAKE_CXX11_COMPILE_FEATURES "@CMAKE_CXX11_COMPILE_FEATURES@")
+set(CMAKE_CXX11_COMPILE_EXTENSIONS "@CMAKE_CXX11_COMPILE_EXTENSIONS@")
+
set(CMAKE_CXX_PLATFORM_ID "@CMAKE_CXX_PLATFORM_ID@")
set(CMAKE_CXX_SIMULATE_ID "@CMAKE_CXX_SIMULATE_ID@")
set(CMAKE_CXX_SIMULATE_VERSION "@CMAKE_CXX_SIMULATE_VERSION@")
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCCompiler.cmake.in | 1 -
Modules/CMakeCXXCompiler.cmake.in | 4 ++++
2 files changed, 4 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list