[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2917-g599e7e3
Stephen Kelly
steveire at gmail.com
Wed May 7 06:16:45 EDT 2014
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 599e7e3968aa51a61b5d5be1083d90c4093750d5 (commit)
via c4f4dac2d550f0a8a44530187eac2ad03191c981 (commit)
via 5bb7ce724c8b93d390adb17ec0eb7970520ed114 (commit)
via 64254e7a74455d194092c9dba64e8d5c910a8f21 (commit)
via 0d9c99bf04513bd2fd69e3673f9469c4cd69dc4c (commit)
via dc7639bdabee1d2b8c82b64a65607e7dbe29cd5a (commit)
via c010e7cc806d845f1b048bc8c41d2c1326075beb (commit)
from 64fc4fc5508c8ab9ad5f0dc8ed55ac91a0180fff (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=599e7e3968aa51a61b5d5be1083d90c4093750d5
commit 599e7e3968aa51a61b5d5be1083d90c4093750d5
Merge: 64fc4fc c4f4dac
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 06:16:44 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 7 06:16:44 2014 -0400
Merge topic 'minor-cleanups' into next
c4f4dac2 Project: Fix exit-on-error with compile feature tests.
5bb7ce72 Project: Use nullary form of main for compile feature tests.
64254e7a Project: Remove extern from static string in feature tests.
0d9c99bf Help: Fix order of help entries.
dc7639bd Tests: Fix name of cache variable.
c010e7cc CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4f4dac2d550f0a8a44530187eac2ad03191c981
commit c4f4dac2d550f0a8a44530187eac2ad03191c981
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 21:31:30 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 7 12:16:14 2014 +0200
Project: Fix exit-on-error with compile feature tests.
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 6ec3958..7464525 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -27,14 +27,13 @@ endif()
macro(cmake_record_cxx_compile_features)
macro(_get_gcc_features std_version list)
record_compiler_features(CXX "-std=${std_version}" ${list})
- if (NOT _result EQUAL 0)
- return()
- endif()
endmacro()
if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
_get_gcc_features(c++11 CMAKE_CXX11_COMPILE_FEATURES)
- _get_gcc_features(c++98 CMAKE_CXX98_COMPILE_FEATURES)
+ if (_result EQUAL 0)
+ _get_gcc_features(c++98 CMAKE_CXX98_COMPILE_FEATURES)
+ endif()
else()
set(_result 0)
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bb7ce724c8b93d390adb17ec0eb7970520ed114
commit 5bb7ce724c8b93d390adb17ec0eb7970520ed114
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 21:24:02 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 7 12:16:13 2014 +0200
Project: Use nullary form of main for compile feature tests.
diff --git a/Modules/Internal/FeatureTesting.cmake b/Modules/Internal/FeatureTesting.cmake
index f4adb35..7bf6d91 100644
--- a/Modules/Internal/FeatureTesting.cmake
+++ b/Modules/Internal/FeatureTesting.cmake
@@ -20,7 +20,7 @@ macro(record_compiler_features lang compile_flags feature_list)
endif()
endforeach()
file(APPEND "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}"
- "\n};\n\nint main(int, char **) { return 0; }\n")
+ "\n};\n\nint main() { return 0; }\n")
try_compile(CMAKE_${lang}_FEATURE_TEST
${CMAKE_BINARY_DIR} "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64254e7a74455d194092c9dba64e8d5c910a8f21
commit 64254e7a74455d194092c9dba64e8d5c910a8f21
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 21:23:36 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 7 12:16:13 2014 +0200
Project: Remove extern from static string in feature tests.
diff --git a/Modules/Internal/FeatureTesting.cmake b/Modules/Internal/FeatureTesting.cmake
index 0fff36b..f4adb35 100644
--- a/Modules/Internal/FeatureTesting.cmake
+++ b/Modules/Internal/FeatureTesting.cmake
@@ -5,7 +5,7 @@ macro(record_compiler_features lang compile_flags feature_list)
string(TOLOWER ${lang} lang_lc)
file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.bin")
file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}" "
- extern const char features[] = {\"\"\n")
+ const char features[] = {\"\"\n")
get_property(known_features GLOBAL PROPERTY CMAKE_${lang}_KNOWN_FEATURES)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d9c99bf04513bd2fd69e3673f9469c4cd69dc4c
commit 0d9c99bf04513bd2fd69e3673f9469c4cd69dc4c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 21:21:46 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 7 12:16:11 2014 +0200
Help: Fix order of help entries.
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index da21e29..01fe42d 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -108,8 +108,8 @@ Properties on Targets
/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG
/prop_tgt/CONFIG_OUTPUT_NAME
/prop_tgt/CONFIG_POSTFIX
- /prop_tgt/CXX_STANDARD
/prop_tgt/CXX_EXTENSIONS
+ /prop_tgt/CXX_STANDARD
/prop_tgt/DEBUG_POSTFIX
/prop_tgt/DEFINE_SYMBOL
/prop_tgt/EchoString
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 82242f5..e2958a1 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -258,8 +258,8 @@ Variables for Languages
/variable/CMAKE_COMPILER_IS_GNULANG
/variable/CMAKE_CXX_COMPILE_FEATURES
- /variable/CMAKE_CXX_STANDARD
/variable/CMAKE_CXX_EXTENSIONS
+ /variable/CMAKE_CXX_STANDARD
/variable/CMAKE_Fortran_MODDIR_DEFAULT
/variable/CMAKE_Fortran_MODDIR_FLAG
/variable/CMAKE_Fortran_MODOUT_FLAG
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc7639bdabee1d2b8c82b64a65607e7dbe29cd5a
commit dc7639bdabee1d2b8c82b64a65607e7dbe29cd5a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 21:20:49 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 7 12:15:39 2014 +0200
Tests: Fix name of cache variable.
diff --git a/Tests/ExportImport/Import/Interface/CMakeLists.txt b/Tests/ExportImport/Import/Interface/CMakeLists.txt
index 1f30c67..18d9b76 100644
--- a/Tests/ExportImport/Import/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/Interface/CMakeLists.txt
@@ -50,9 +50,9 @@ macro(do_try_compile prefix)
auto value = 0;
return value;
}
- " ${prefix}IMPORTED_IFACE_CONSTEXPR)
+ " ${prefix}IMPORTED_IFACE_AUTO_TYPE)
- if(NOT ${prefix}IMPORTED_IFACE_CONSTEXPR)
+ if(NOT ${prefix}IMPORTED_IFACE_AUTO_TYPE)
message(SEND_ERROR "${prefix} try_compile with IMPORTED INTERFACE target failed!\n\n${OUTPUT}")
endif()
endif()
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 2 +-
Help/manual/cmake-variables.7.rst | 2 +-
Modules/Compiler/GNU-CXX.cmake | 7 +++----
Modules/Internal/FeatureTesting.cmake | 4 ++--
Source/CMakeVersion.cmake | 2 +-
Tests/ExportImport/Import/Interface/CMakeLists.txt | 4 ++--
6 files changed, 10 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list