[Cmake-commits] CMake branch, master, updated. v3.7.1-905-g9639b2f
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 9639b2f7e7fadee1c160b915183dc2aa30a0408e (commit) from 0a9e4e08b5d275fa20190509d6b1448f360461a8 (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=9639b2f7e7fadee1c160b915183dc2aa30a0408e commit 9639b2f7e7fadee1c160b915183dc2aa30a0408e Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Sat Dec 17 00:01:05 2016 -0500 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Sat Dec 17 00:01:05 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ae9c31e..38cd4a9 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 7) -set(CMake_VERSION_PATCH 20161216) +set(CMake_VERSION_PATCH 20161217) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1813-g9220290
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 9220290194fffec111890c28ff17ff0b79947a5b (commit) via 78b6017c86c7367bf7ef217e026c71435df491e2 (commit) via e9d1ae8c8e19d9a5394311488c319ba7b783 (commit) from b5b7a7107955aaa704230378393745f1dffeddc1 (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=9220290194fffec111890c28ff17ff0b79947a5b commit 9220290194fffec111890c28ff17ff0b79947a5b Merge: b5b7a71 78b6017 Author: Rolf Eike BeerAuthorDate: Fri Dec 16 11:17:42 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 11:17:42 2016 -0500 Merge topic 'gcc-34-features' into next 78b6017c record features of gcc 3.4..4.3 e9d1ae8c use cxx_long_long_type instead of cxx_auto_type to check C++ compile features https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78b6017c86c7367bf7ef217e026c71435df491e2 commit 78b6017c86c7367bf7ef217e026c71435df491e2 Author: Rolf Eike Beer AuthorDate: Thu Dec 15 22:54:41 2016 +0100 Commit: Rolf Eike Beer CommitDate: Fri Dec 16 17:17:31 2016 +0100 record features of gcc 3.4..4.3 This is not entirely complete, i.e. for some features the version they were introduced in is not set yet. This is just a first test to see what breaks. DO NOT MERGE YET. diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake index b3fe33f..0ab5265 100644 --- a/Modules/Compiler/GNU-C-FeatureTests.cmake +++ b/Modules/Compiler/GNU-C-FeatureTests.cmake @@ -1,5 +1,5 @@ -set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404") +set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304") # GNU 4.7 correctly sets __STDC_VERSION__ to 201112L, but GNU 4.6 sets it # to 201000L. As the former is strictly greater than the latter, test only @@ -8,10 +8,10 @@ set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404") # to the distinction between __cplusplus and __GXX_EXPERIMENTAL_CXX0X__ tests. set(GNU46_C11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L") set(_cmake_feature_test_c_static_assert "${GNU46_C11}") -# Since 4.4 at least: -set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") -set(_cmake_feature_test_c_restrict "${GNU44_C99}") -set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}") +# Since 3.4 at least: +set(GNU34_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") +set(_cmake_feature_test_c_restrict "${GNU34_C99}") +set(_cmake_feature_test_c_variadic_macros "${GNU34_C99}") set(GNU_C90 "${_cmake_oldestSupported}") set(_cmake_feature_test_c_function_prototypes "${GNU_C90}") diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake index 05c3bb2..3f02618 100644 --- a/Modules/Compiler/GNU-C.cmake +++ b/Modules/Compiler/GNU-C.cmake @@ -4,12 +4,12 @@ __compiler_gnu(C) if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5) set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90") -elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) +elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu89") endif() -if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) +if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99") set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99") endif() @@ -22,7 +22,7 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6) set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x") endif() -if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) +if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) if (NOT CMAKE_C_COMPILER_FORCED) if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT) message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version ${CMAKE_C_COMPILER_VERSION}") @@ -38,10 +38,9 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) endif() endif() - macro(cmake_record_c_compile_features) set(_result 0) - if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) + if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) if(_result EQUAL 0 AND CMAKE_C11_STANDARD_COMPILE_OPTION) _record_compiler_features_c(11) endif() diff --git
[Cmake-commits] CMake branch, next, updated. v3.7.1-1810-gb5b7a71
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 b5b7a7107955aaa704230378393745f1dffeddc1 (commit) via 682a8d17ce83d04b867e7197cc7e34734d4990f9 (commit) from 35ca0a30dcc2048ccac57e1dec7756416abd3468 (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=b5b7a7107955aaa704230378393745f1dffeddc1 commit b5b7a7107955aaa704230378393745f1dffeddc1 Merge: 35ca0a3 682a8d1 Author: Rolf Eike BeerAuthorDate: Fri Dec 16 11:17:16 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 11:17:16 2016 -0500 Merge topic 'gcc-34-features' into next 682a8d17 FIXUP: CompileFeatures tests https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=682a8d17ce83d04b867e7197cc7e34734d4990f9 commit 682a8d17ce83d04b867e7197cc7e34734d4990f9 Author: Rolf Eike Beer AuthorDate: Fri Dec 16 17:16:56 2016 +0100 Commit: Rolf Eike Beer CommitDate: Fri Dec 16 17:16:56 2016 +0100 FIXUP: CompileFeatures tests diff --git a/Tests/CMakeCommands/target_compile_features/main.cpp b/Tests/CMakeCommands/target_compile_features/main.cpp index 9ebeefc..aee232a 100644 --- a/Tests/CMakeCommands/target_compile_features/main.cpp +++ b/Tests/CMakeCommands/target_compile_features/main.cpp @@ -2,5 +2,5 @@ int main(int, char**) { long long i = 1 << 31; - return (i << 1) != 0; + return (i << 1) == 0; } diff --git a/Tests/CompileFeatures/main.cpp b/Tests/CompileFeatures/main.cpp index 7abf90f..5472cab 100644 --- a/Tests/CompileFeatures/main.cpp +++ b/Tests/CompileFeatures/main.cpp @@ -2,5 +2,5 @@ int main(int, char**) { long long value = 1 << 31; - return (value << 1) != 0; + return (value << 1) == 0; } --- Summary of changes: Tests/CMakeCommands/target_compile_features/main.cpp |2 +- Tests/CompileFeatures/main.cpp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1808-g35ca0a3
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 35ca0a30dcc2048ccac57e1dec7756416abd3468 (commit) via d415b3cffa0beec9f7d174400f6850ad68972e28 (commit) via 8f2af4b18e340ea50a716199e27e8af27b929aca (commit) from 369bfc70d8548baaad751c11d36b88f7c2678f78 (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=35ca0a30dcc2048ccac57e1dec7756416abd3468 commit 35ca0a30dcc2048ccac57e1dec7756416abd3468 Merge: 369bfc7 d415b3c Author: Rolf Eike BeerAuthorDate: Fri Dec 16 10:58:55 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 10:58:55 2016 -0500 Merge topic 'gcc-34-features' into next d415b3cf record features of gcc 3.4..4.3 8f2af4b1 use cxx_long_long_type instead of cxx_auto_type to check C++ compile features https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d415b3cffa0beec9f7d174400f6850ad68972e28 commit d415b3cffa0beec9f7d174400f6850ad68972e28 Author: Rolf Eike Beer AuthorDate: Thu Dec 15 22:54:41 2016 +0100 Commit: Rolf Eike Beer CommitDate: Fri Dec 16 16:58:25 2016 +0100 record features of gcc 3.4..4.3 This is not entirely complete, i.e. for some features the version they were introduced in is not set yet. This is just a first test to see what breaks. DO NOT MERGE YET. diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake index b3fe33f..0ab5265 100644 --- a/Modules/Compiler/GNU-C-FeatureTests.cmake +++ b/Modules/Compiler/GNU-C-FeatureTests.cmake @@ -1,5 +1,5 @@ -set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404") +set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304") # GNU 4.7 correctly sets __STDC_VERSION__ to 201112L, but GNU 4.6 sets it # to 201000L. As the former is strictly greater than the latter, test only @@ -8,10 +8,10 @@ set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404") # to the distinction between __cplusplus and __GXX_EXPERIMENTAL_CXX0X__ tests. set(GNU46_C11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L") set(_cmake_feature_test_c_static_assert "${GNU46_C11}") -# Since 4.4 at least: -set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") -set(_cmake_feature_test_c_restrict "${GNU44_C99}") -set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}") +# Since 3.4 at least: +set(GNU34_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") +set(_cmake_feature_test_c_restrict "${GNU34_C99}") +set(_cmake_feature_test_c_variadic_macros "${GNU34_C99}") set(GNU_C90 "${_cmake_oldestSupported}") set(_cmake_feature_test_c_function_prototypes "${GNU_C90}") diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake index 05c3bb2..3f02618 100644 --- a/Modules/Compiler/GNU-C.cmake +++ b/Modules/Compiler/GNU-C.cmake @@ -4,12 +4,12 @@ __compiler_gnu(C) if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5) set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90") -elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) +elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu89") endif() -if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) +if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99") set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99") endif() @@ -22,7 +22,7 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6) set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x") endif() -if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) +if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) if (NOT CMAKE_C_COMPILER_FORCED) if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT) message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version ${CMAKE_C_COMPILER_VERSION}") @@ -38,10 +38,9 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) endif() endif() - macro(cmake_record_c_compile_features) set(_result 0) - if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) + if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) if(_result EQUAL 0 AND CMAKE_C11_STANDARD_COMPILE_OPTION) _record_compiler_features_c(11) endif() diff --git
[Cmake-commits] CMake branch, next, updated. v3.7.1-1805-g369bfc7
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 369bfc70d8548baaad751c11d36b88f7c2678f78 (commit) via b59ed27ea731244fad7276182467b1076704a10a (commit) via 6bb3ebd485cd92c3c9760432dd4db716ec831723 (commit) from 8c6f5311aea01e3d8dd597c6f5c847bb55420471 (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=369bfc70d8548baaad751c11d36b88f7c2678f78 commit 369bfc70d8548baaad751c11d36b88f7c2678f78 Merge: 8c6f531 b59ed27 Author: Rolf Eike BeerAuthorDate: Fri Dec 16 10:58:01 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 10:58:01 2016 -0500 Merge topic 'gcc-34-features' into next b59ed27e use cxx_long_long_type instead of cxx_auto_type to check C++ compile features 6bb3ebd4 FIXUP: gcc 3.4 features https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b59ed27ea731244fad7276182467b1076704a10a commit b59ed27ea731244fad7276182467b1076704a10a Author: Rolf Eike Beer AuthorDate: Fri Dec 16 16:53:39 2016 +0100 Commit: Rolf Eike Beer CommitDate: Fri Dec 16 16:57:15 2016 +0100 use cxx_long_long_type instead of cxx_auto_type to check C++ compile features Older gcc versions do not support auto, but already have some C++11 features available as extension. diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt index 9b35f27..8a433cd 100644 --- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt +++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt @@ -32,7 +32,7 @@ if (CMAKE_CXX_COMPILE_FEATURES) endif() add_executable(target_compile_features${target_suffix} main.cpp) target_compile_features(target_compile_features${target_suffix} -PRIVATE cxx_auto_type +PRIVATE cxx_long_long_type ) add_library(lib_auto_type lib_auto_type.cpp) diff --git a/Tests/CMakeCommands/target_compile_features/main.cpp b/Tests/CMakeCommands/target_compile_features/main.cpp index 6f5daee..9ebeefc 100644 --- a/Tests/CMakeCommands/target_compile_features/main.cpp +++ b/Tests/CMakeCommands/target_compile_features/main.cpp @@ -1,6 +1,6 @@ int main(int, char**) { - auto i = 0; - return i; + long long i = 1 << 31; + return (i << 1) != 0; } diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt index 0405def..fbd868f 100644 --- a/Tests/CompileFeatures/CMakeLists.txt +++ b/Tests/CompileFeatures/CMakeLists.txt @@ -278,7 +278,7 @@ if (CMAKE_CXX_COMPILE_FEATURES) add_executable(CompileFeatures main.cpp) set_property(TARGET CompileFeatures -PROPERTY COMPILE_FEATURES "cxx_auto_type" +PROPERTY COMPILE_FEATURES "cxx_long_long_type" ) set_property(TARGET CompileFeatures PROPERTY CXX_STANDARD_REQUIRED TRUE diff --git a/Tests/CompileFeatures/main.cpp b/Tests/CompileFeatures/main.cpp index c5a7a46..7abf90f 100644 --- a/Tests/CompileFeatures/main.cpp +++ b/Tests/CompileFeatures/main.cpp @@ -1,6 +1,6 @@ int main(int, char**) { - auto value = 0; - return value; + long long value = 1 << 31; + return (value << 1) != 0; } https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6bb3ebd485cd92c3c9760432dd4db716ec831723 commit 6bb3ebd485cd92c3c9760432dd4db716ec831723 Author: Rolf Eike Beer AuthorDate: Fri Dec 16 16:50:45 2016 +0100 Commit: Rolf Eike Beer CommitDate: Fri Dec 16 16:57:15 2016 +0100 FIXUP: gcc 3.4 features diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake index 48442dd..3f02618 100644 --- a/Modules/Compiler/GNU-C.cmake +++ b/Modules/Compiler/GNU-C.cmake @@ -4,7 +4,7 @@ __compiler_gnu(C) if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5) set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90") -elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) +elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu89") endif() @@ -38,7 +38,6 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) endif() endif() - macro(cmake_record_c_compile_features) set(_result 0) if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) --- Summary of changes: Modules/Compiler/GNU-C.cmake |3 +-- Tests/CMakeCommands/target_compile_features/CMakeLists.txt |2 +-
[Cmake-commits] CMake branch, next, updated. v3.7.1-1802-g8c6f531
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 8c6f5311aea01e3d8dd597c6f5c847bb55420471 (commit) via 8e4d286e7b105407d523ccf745198d0400b5fdb3 (commit) from 5d2b217e602966c0dc25ee70181bb47c97f6ed08 (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=8c6f5311aea01e3d8dd597c6f5c847bb55420471 commit 8c6f5311aea01e3d8dd597c6f5c847bb55420471 Merge: 5d2b217 8e4d286 Author: Brad KingAuthorDate: Fri Dec 16 09:21:32 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 09:21:32 2016 -0500 Merge topic 'fix-required-var-error-typo' into next 8e4d286e Fix typo in error message on missing required variable https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e4d286e7b105407d523ccf745198d0400b5fdb3 commit 8e4d286e7b105407d523ccf745198d0400b5fdb3 Author: Brad King AuthorDate: Fri Dec 16 09:20:32 2016 -0500 Commit: Brad King CommitDate: Fri Dec 16 09:20:32 2016 -0500 Fix typo in error message on missing required variable Reported-by: Albrecht Schlosser diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index fccb486..cfc0495 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2215,7 +2215,7 @@ const char* cmMakefile::GetRequiredDefinition(const std::string& name) const const char* ret = this->GetDefinition(name); if (!ret) { cmSystemTools::Error("Error required internal CMake variable not " - "set, cmake may be not be built correctly.\n", + "set, cmake may not be built correctly.\n", "Missing variable is:\n", name.c_str()); return ""; } --- Summary of changes: Source/cmMakefile.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1800-g5d2b217
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 5d2b217e602966c0dc25ee70181bb47c97f6ed08 (commit) via 7789dd9a1ae79d6747883739a21cf90c139d1e54 (commit) from eb64b2e2b41fe619e643045056a24bd6d6b81b87 (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=5d2b217e602966c0dc25ee70181bb47c97f6ed08 commit 5d2b217e602966c0dc25ee70181bb47c97f6ed08 Merge: eb64b2e 7789dd9 Author: Brad KingAuthorDate: Fri Dec 16 08:58:03 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 08:58:03 2016 -0500 Merge topic 'mr-reset-error-flag-on-configure' into next 7789dd9a server-mode: Call ResetErrorOccured before configure https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7789dd9a1ae79d6747883739a21cf90c139d1e54 commit 7789dd9a1ae79d6747883739a21cf90c139d1e54 Author: Tobias Hunger AuthorDate: Fri Dec 16 09:24:39 2016 +0100 Commit: Brad King CommitDate: Fri Dec 16 08:54:37 2016 -0500 server-mode: Call ResetErrorOccured before configure Closes: #16506 diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index e159c8f..7815491 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -984,6 +984,8 @@ cmServerResponse cmServerProtocol1_0::ProcessConfigure( } } + cmSystemTools::ResetErrorOccuredFlag(); // Reset error state + if (cm->AddCMakePaths() != 1) { return request.ReportError("Failed to set CMake paths."); } --- Summary of changes: Source/cmServerProtocol.cxx |2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1798-geb64b2e
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 eb64b2e2b41fe619e643045056a24bd6d6b81b87 (commit) via 4087d0ae85cd9835296a82e0d5a63db0feabcb93 (commit) from f1297c25f0edd121295893950b501acc3905715f (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=eb64b2e2b41fe619e643045056a24bd6d6b81b87 commit eb64b2e2b41fe619e643045056a24bd6d6b81b87 Merge: f1297c2 4087d0a Author: Brad KingAuthorDate: Fri Dec 16 08:37:52 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 08:37:52 2016 -0500 Merge topic 'pgi-ninja-fortran' into next 4087d0ae PGI: Add support for Fortran with the Ninja generator https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4087d0ae85cd9835296a82e0d5a63db0feabcb93 commit 4087d0ae85cd9835296a82e0d5a63db0feabcb93 Author: Daniel Carrera AuthorDate: Fri Dec 16 03:10:21 2016 +0100 Commit: Brad King CommitDate: Fri Dec 16 08:33:21 2016 -0500 PGI: Add support for Fortran with the Ninja generator The PGI documentation says that `-Mpreprocess` "instructs the compiler to perform cpp-like preprocessing on assembly and Fortran input source files". The `-E` flag causes the compiler to spit the result to stdout instead of saving it to a file. diff --git a/Modules/Compiler/PGI-Fortran.cmake b/Modules/Compiler/PGI-Fortran.cmake index 3765079..4783424 100644 --- a/Modules/Compiler/PGI-Fortran.cmake +++ b/Modules/Compiler/PGI-Fortran.cmake @@ -1,6 +1,9 @@ include(Compiler/PGI) __compiler_pgi(Fortran) +set(CMAKE_Fortran_PREPROCESS_SOURCE + " -Mpreprocess-E > ") + set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-Mnofreeform") set(CMAKE_Fortran_FORMAT_FREE_FLAG "-Mfreeform") --- Summary of changes: Modules/Compiler/PGI-Fortran.cmake |3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1796-gf1297c2
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 f1297c25f0edd121295893950b501acc3905715f (commit) via 0a9e4e08b5d275fa20190509d6b1448f360461a8 (commit) via b5c7835e27dc4bb009d508a5b280ebd01b2fcd71 (commit) via 58dc3745ec925923713f16c0e77bc9277b29eb7d (commit) via ed8a9cb7de9323709b125eb4af97cc6a8c444a66 (commit) via 4a06479874e583181f86fb64bf795e1eb1ee0de2 (commit) via 5c616c1089ea351336a7eefbf53ffb6e5bd8e97d (commit) via 25d7b8836d8a073d13c384a14bae05d5c1d244eb (commit) from 52a9fd5a28163f02091b81d343ac897df5f6fc37 (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=f1297c25f0edd121295893950b501acc3905715f commit f1297c25f0edd121295893950b501acc3905715f Merge: 52a9fd5 0a9e4e0 Author: Brad KingAuthorDate: Fri Dec 16 08:26:36 2016 -0500 Commit: Brad King CommitDate: Fri Dec 16 08:26:36 2016 -0500 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-902-gb5c7835
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 b5c7835e27dc4bb009d508a5b280ebd01b2fcd71 (commit) via c59811a233267a21fdea14af4bc6583af0f8d9b0 (commit) from 58dc3745ec925923713f16c0e77bc9277b29eb7d (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=b5c7835e27dc4bb009d508a5b280ebd01b2fcd71 commit b5c7835e27dc4bb009d508a5b280ebd01b2fcd71 Merge: 58dc374 c59811a Author: Brad KingAuthorDate: Fri Dec 16 08:26:20 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 08:26:20 2016 -0500 Merge topic 'cuda_tests_now_explain_why_they_fail' c59811a2 CUDA: Tests now state why they are failing when no CUDA card is found. --- Summary of changes: Tests/Cuda/Complex/dynamic.cu | 12 +--- Tests/Cuda/Complex/file3.cu|8 ++-- Tests/Cuda/Complex/mixed.cu|6 -- Tests/CudaOnly/WithDefs/main.notcu |1 + 4 files changed, 16 insertions(+), 11 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-894-g5c616c1
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 5c616c1089ea351336a7eefbf53ffb6e5bd8e97d (commit) via 40e5614923db52a31b5e46a3bbc5e70105fcbf5a (commit) from 25d7b8836d8a073d13c384a14bae05d5c1d244eb (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=5c616c1089ea351336a7eefbf53ffb6e5bd8e97d commit 5c616c1089ea351336a7eefbf53ffb6e5bd8e97d Merge: 25d7b88 40e5614 Author: Brad KingAuthorDate: Fri Dec 16 08:25:50 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 08:25:50 2016 -0500 Merge topic 'copyright-year' 40e56149 Copyright.txt: Update year range to end in 2017 --- Summary of changes: Copyright.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-900-g58dc374
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 58dc3745ec925923713f16c0e77bc9277b29eb7d (commit) via a12d8a03af8430d0a570c97deb200e16830568eb (commit) from ed8a9cb7de9323709b125eb4af97cc6a8c444a66 (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=58dc3745ec925923713f16c0e77bc9277b29eb7d commit 58dc3745ec925923713f16c0e77bc9277b29eb7d Merge: ed8a9cb a12d8a0 Author: Brad KingAuthorDate: Fri Dec 16 08:26:16 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 08:26:16 2016 -0500 Merge topic 'FindPythonLibs-tolerate-components' a12d8a03 FindPythonLibs: Tolerate call with PYTHON_LIBRARY already a list --- Summary of changes: Modules/FindPythonLibs.cmake | 19 +-- 1 file changed, 13 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-904-g0a9e4e0
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 0a9e4e08b5d275fa20190509d6b1448f360461a8 (commit) via caeb6d1dfb7ec9ab471d24e71244d7899f044c27 (commit) from b5c7835e27dc4bb009d508a5b280ebd01b2fcd71 (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=0a9e4e08b5d275fa20190509d6b1448f360461a8 commit 0a9e4e08b5d275fa20190509d6b1448f360461a8 Merge: b5c7835 caeb6d1 Author: Brad KingAuthorDate: Fri Dec 16 08:26:23 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 08:26:23 2016 -0500 Merge topic 'FindGit-fix-cross-compile' caeb6d1d FindGit: Fix check for Windows host --- Summary of changes: Modules/FindGit.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-898-ged8a9cb
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 ed8a9cb7de9323709b125eb4af97cc6a8c444a66 (commit) via 6271df8ff5ce5552929bb76440fa432641498800 (commit) from 4a06479874e583181f86fb64bf795e1eb1ee0de2 (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=ed8a9cb7de9323709b125eb4af97cc6a8c444a66 commit ed8a9cb7de9323709b125eb4af97cc6a8c444a66 Merge: 4a06479 6271df8 Author: Brad KingAuthorDate: Fri Dec 16 08:26:12 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 08:26:12 2016 -0500 Merge topic 'refactor-compile-pdb-path' 6271df8f Makefile,Ninja: De-duplicate MSVC compiler PDB path selection --- Summary of changes: Source/cmCommonTargetGenerator.cxx | 22 ++ Source/cmCommonTargetGenerator.h |1 + Source/cmMakefileTargetGenerator.cxx | 17 + Source/cmNinjaTargetGenerator.cxx| 16 +--- 4 files changed, 25 insertions(+), 31 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-896-g4a06479
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 4a06479874e583181f86fb64bf795e1eb1ee0de2 (commit) via 5c6c0344d32f9282059d46b6fe6f9925ac1f1202 (commit) from 5c616c1089ea351336a7eefbf53ffb6e5bd8e97d (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=4a06479874e583181f86fb64bf795e1eb1ee0de2 commit 4a06479874e583181f86fb64bf795e1eb1ee0de2 Merge: 5c616c1 5c6c034 Author: Brad KingAuthorDate: Fri Dec 16 08:26:06 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 16 08:26:06 2016 -0500 Merge topic 'csharp_support_compiler_detection' 5c6c0344 C# support: add compiler detection for MSVC --- Summary of changes: Modules/CMakeCSharpCompiler.cmake.in |9 ++ Modules/CMakeCSharpCompilerId.cs.in| 63 +++ Modules/CMakeCSharpInformation.cmake | 119 Modules/CMakeCompilerIdDetection.cmake |2 +- Modules/CMakeDetermineCSharpCompiler.cmake | 43 +++ Modules/CMakeDetermineCompilerId.cmake | 10 +- Modules/CMakeTestCSharpCompiler.cmake | 68 +++ Modules/CompilerId/VS-10.csproj.in | 55 + Tests/CMakeOnly/CMakeLists.txt |3 + .../CMakeLists.txt | 12 +- 10 files changed, 376 insertions(+), 8 deletions(-) create mode 100644 Modules/CMakeCSharpCompiler.cmake.in create mode 100644 Modules/CMakeCSharpCompilerId.cs.in create mode 100644 Modules/CMakeCSharpInformation.cmake create mode 100644 Modules/CMakeDetermineCSharpCompiler.cmake create mode 100644 Modules/CMakeTestCSharpCompiler.cmake create mode 100644 Modules/CompilerId/VS-10.csproj.in copy Tests/CMakeOnly/{CompilerIdC => CompilerIdCSharp}/CMakeLists.txt (61%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits