[Cmake-commits] CMake branch, master, updated. v3.6.2-1012-g4171b86
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 4171b86ca351a26b8824ee8af0db5145232710f1 (commit) from 00fd64d1263901f96935e15c8d90ee8a338cee1a (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=4171b86ca351a26b8824ee8af0db5145232710f1 commit 4171b86ca351a26b8824ee8af0db5145232710f1 Author: Kitware Robot AuthorDate: Sat Sep 17 00:01:05 2016 -0400 Commit: Kitware Robot CommitDate: Sat Sep 17 00:01:05 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 09f55fa..7cd082d 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 6) -set(CMake_VERSION_PATCH 20160916) +set(CMake_VERSION_PATCH 20160917) #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.6.2-2139-ga1d30dc
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 a1d30dcccfa79e3f79ab13c88749a8d0f04f14aa (commit) via 3fab1fef23476b27274cddf4bb8f6cbe8d36c712 (commit) from df4c1374fb8c4e1a966fc3610c4af0fc13d05fd5 (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=a1d30dcccfa79e3f79ab13c88749a8d0f04f14aa commit a1d30dcccfa79e3f79ab13c88749a8d0f04f14aa Merge: df4c137 3fab1fe Author: Daniel Pfeifer AuthorDate: Fri Sep 16 17:31:48 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 17:31:48 2016 -0400 Merge topic 'clang-tidy-fixes' into next 3fab1fef cmNinjaNormalTargetGenerator: make sure comments match parameter names https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fab1fef23476b27274cddf4bb8f6cbe8d36c712 commit 3fab1fef23476b27274cddf4bb8f6cbe8d36c712 Author: Daniel Pfeifer AuthorDate: Fri Sep 16 23:31:37 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 16 23:31:37 2016 +0200 cmNinjaNormalTargetGenerator: make sure comments match parameter names diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 335b552..b2384b0 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -336,7 +336,7 @@ std::vector cmNinjaNormalTargetGenerator::ComputeLinkCmd() std::string targetOutputReal = this->ConvertToNinjaPath(gt.GetFullPath(cfgName, /*implib=*/false, - /*realpath=*/true)); + /*realname=*/true)); cmakeCommand += targetOutputReal; cmakeCommand += " || true"; linkCmds.push_back(cmakeCommand); @@ -414,7 +414,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() std::string targetOutputReal = ConvertToNinjaPath(gt.GetFullPath(cfgName, /*implib=*/false, - /*realpath=*/true)); + /*realname=*/true)); std::string targetOutputImplib = ConvertToNinjaPath(gt.GetFullPath(cfgName, /*implib=*/true)); --- Summary of changes: Source/cmNinjaNormalTargetGenerator.cxx |4 ++-- 1 file 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.6.2-2137-gdf4c137
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 df4c1374fb8c4e1a966fc3610c4af0fc13d05fd5 (commit) via 7b94a7adb32d1a8966628d2b194cfc5de04d7ecc (commit) from 7a2e9e8cb77e7ceeb7a160c8e83ed974c3db10b2 (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=df4c1374fb8c4e1a966fc3610c4af0fc13d05fd5 commit df4c1374fb8c4e1a966fc3610c4af0fc13d05fd5 Merge: 7a2e9e8 7b94a7a Author: Daniel Pfeifer AuthorDate: Fri Sep 16 17:17:39 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 17:17:39 2016 -0400 Merge topic 'clang-tidy-fixes' into next 7b94a7ad cmCommandArgumentsHelper: simplify boolean expression https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b94a7adb32d1a8966628d2b194cfc5de04d7ecc commit 7b94a7adb32d1a8966628d2b194cfc5de04d7ecc Author: Daniel Pfeifer AuthorDate: Fri Sep 16 23:16:54 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 16 23:16:54 2016 +0200 cmCommandArgumentsHelper: simplify boolean expression diff --git a/Source/cmCommandArgumentsHelper.cxx b/Source/cmCommandArgumentsHelper.cxx index 1345bd5..b8fe365 100644 --- a/Source/cmCommandArgumentsHelper.cxx +++ b/Source/cmCommandArgumentsHelper.cxx @@ -57,14 +57,7 @@ bool cmCommandArgument::MayFollow(const cmCommandArgument* current) const if (this->ArgumentsBeforeEmpty) { return true; } - - std::set::const_iterator argIt = -this->ArgumentsBefore.find(current); - if (argIt != this->ArgumentsBefore.end()) { -return true; - } - - return false; + return this->ArgumentsBefore.find(current) != this->ArgumentsBefore.end(); } bool cmCommandArgument::KeyMatches(const std::string& key) const --- Summary of changes: Source/cmCommandArgumentsHelper.cxx |9 + 1 file changed, 1 insertion(+), 8 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.6.2-2135-g7a2e9e8
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 7a2e9e8cb77e7ceeb7a160c8e83ed974c3db10b2 (commit) via 782fcbb92e096a28f899c89eed6fe23f29cd997c (commit) via 809ca6c81fa23cec111a9e97529d71538c55f9eb (commit) via 516f8edb2e061749c56b6f9a58332fbf59e45a1a (commit) via d9f5d3c50fe376423382d6445f7fb2906a43469e (commit) via 3fda10945132fdd2dc11ea074a96789a4afa86bc (commit) from f9224eb7b28c6c6456524906103e7f26b5afe17e (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=7a2e9e8cb77e7ceeb7a160c8e83ed974c3db10b2 commit 7a2e9e8cb77e7ceeb7a160c8e83ed974c3db10b2 Merge: f9224eb 782fcbb Author: Daniel Pfeifer AuthorDate: Fri Sep 16 17:04:57 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 17:04:57 2016 -0400 Merge topic 'clang-tidy-fixes' into next 782fcbb9 Use CM_NULLPTR 809ca6c8 Use braces around statements 516f8edb Avoid else after return d9f5d3c5 Remove redundant get() call on smart pointer 3fda1094 Mark overridden functions with CM_OVERRIDE https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=782fcbb92e096a28f899c89eed6fe23f29cd997c commit 782fcbb92e096a28f899c89eed6fe23f29cd997c Author: Daniel Pfeifer AuthorDate: Fri Sep 16 23:01:40 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 16 23:01:40 2016 +0200 Use CM_NULLPTR diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx index 3aef9cf..8063328 100644 --- a/Source/cmGetPropertyCommand.cxx +++ b/Source/cmGetPropertyCommand.cxx @@ -253,7 +253,7 @@ bool cmGetPropertyCommand::HandleTargetMode() if (this->Makefile->IsAlias(this->Name)) { return this->StoreResult(target->GetName().c_str()); } - return this->StoreResult(NULL); + return this->StoreResult(CM_NULLPTR); } return this->StoreResult( target->GetProperty(this->PropertyName, this->Makefile)); diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index f55fefb..8450360 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -1118,7 +1118,7 @@ bool cmInstallCommand::HandleExportAndroidMKMode( cmCAEnabler exportOld(&ica.Parser, "EXPORT_LINK_INTERFACE_LIBRARIES", &ica.ArgumentGroup); cmCAString filename(&ica.Parser, "FILE", &ica.ArgumentGroup); - exp.Follows(0); + exp.Follows(CM_NULLPTR); ica.ArgumentGroup.Follows(&exp); std::vector unknownArgs; diff --git a/Source/cm_auto_ptr.hxx b/Source/cm_auto_ptr.hxx index 2cd35c3..f6c4362 100644 --- a/Source/cm_auto_ptr.hxx +++ b/Source/cm_auto_ptr.hxx @@ -12,7 +12,7 @@ #ifndef CM_AUTO_PTR_HXX #define CM_AUTO_PTR_HXX -#include +#include // FIXME: Use std::auto_ptr on compilers that do not warn about it. #define CM_AUTO_PTR cm::auto_ptr @@ -115,7 +115,7 @@ public: * * auto_ptr ptr(new X()); */ - explicit auto_ptr(X* p = 0) throw() + explicit auto_ptr(X* p = CM_NULLPTR) throw() : x_(p) { } @@ -157,7 +157,7 @@ public: X* release() throw() { X* x = this->x_; -this->x_ = 0; +this->x_ = CM_NULLPTR; return x; } https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=809ca6c81fa23cec111a9e97529d71538c55f9eb commit 809ca6c81fa23cec111a9e97529d71538c55f9eb Author: Daniel Pfeifer AuthorDate: Fri Sep 16 22:52:02 2016 +0200 Commit: Daniel Pfeifer CommitDate: Fri Sep 16 22:52:02 2016 +0200 Use braces around statements diff --git a/Source/cmCMakeHostSystemInformationCommand.cxx b/Source/cmCMakeHostSystemInformationCommand.cxx index fdbd5e7..6ff7575 100644 --- a/Source/cmCMakeHostSystemInformationCommand.cxx +++ b/Source/cmCMakeHostSystemInformationCommand.cxx @@ -42,9 +42,9 @@ bool cmCMakeHostSystemInformationCommand::InitialPass( result_list += ";"; } std::string value; -if (!this->GetValue(info, key, value)) +if (!this->GetValue(info, key, value)) { return false; - +} result_list += value; } diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 8356fc7..a13309d 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -600,8 +600,9 @@ bool cmFileCommand::HandleStringsCommand(std::vector const& args) // how many octets are there? unsigned int num_utf8_bytes = 0; for (unsigned int j = 0; num_utf8_bytes == 0 && j < 3; j++) { -if ((c & utf8_check_table[j][0]) == utf8_check_table[j][1]) +if ((c & utf8_check_table[j][0]) == utf8_check_table[j][1]) { num_utf8_bytes = j + 2; +} } // get subsequent octets and ch
[Cmake-commits] CMake branch, next, updated. v3.6.2-2127-g5991d31
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 5991d310b7b631ab0716bfb9e182260fe836bd60 (commit) via 9eedf92855a1af4a2a797ae2b4c4404f0e2e2b2d (commit) from f5db532193c0e1396286ba4bb796f4be38e3a420 (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=5991d310b7b631ab0716bfb9e182260fe836bd60 commit 5991d310b7b631ab0716bfb9e182260fe836bd60 Merge: f5db532 9eedf92 Author: Brad King AuthorDate: Fri Sep 16 13:24:47 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 13:24:47 2016 -0400 Merge topic 'cmake-server-basic' into next 9eedf928 Check for availability of unique_ptr and make_unique when building CMake https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9eedf92855a1af4a2a797ae2b4c4404f0e2e2b2d commit 9eedf92855a1af4a2a797ae2b4c4404f0e2e2b2d Author: Brad King AuthorDate: Fri Sep 16 13:21:10 2016 -0400 Commit: Brad King CommitDate: Fri Sep 16 13:24:32 2016 -0400 Check for availability of unique_ptr and make_unique when building CMake Some code paths may find these useful if available. diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake index 960c106..c6a532f 100644 --- a/Source/Checks/cm_cxx_features.cmake +++ b/Source/Checks/cm_cxx_features.cmake @@ -33,8 +33,12 @@ endfunction() if(CMAKE_CXX_STANDARD) cm_check_cxx_feature(make_unique) + if(CMake_HAVE_CXX_MAKE_UNIQUE) +set(CMake_HAVE_CXX_UNIQUE_PTR 1) + endif() cm_check_cxx_feature(nullptr) cm_check_cxx_feature(override) + cm_check_cxx_feature(unique_ptr) cm_check_cxx_feature(unordered_map) cm_check_cxx_feature(unordered_set) endif() diff --git a/Source/Checks/cm_cxx_unique_ptr.cxx b/Source/Checks/cm_cxx_unique_ptr.cxx new file mode 100644 index 000..a9d4ce5 --- /dev/null +++ b/Source/Checks/cm_cxx_unique_ptr.cxx @@ -0,0 +1,6 @@ +#include +int main() +{ + std::unique_ptr u(new int(0)); + return *u; +} diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index ccea22d..8365367 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -30,8 +30,10 @@ #cmakedefine CMAKE_USE_MACH_PARSER #cmakedefine CMAKE_USE_LIBUV #cmakedefine CMAKE_ENCODING_UTF8 +#cmakedefine CMake_HAVE_CXX_MAKE_UNIQUE #cmakedefine CMake_HAVE_CXX_NULLPTR #cmakedefine CMake_HAVE_CXX_OVERRIDE +#cmakedefine CMake_HAVE_CXX_UNIQUE_PTR #cmakedefine CMake_HAVE_CXX_UNORDERED_MAP #cmakedefine CMake_HAVE_CXX_UNORDERED_SET #define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@" --- Summary of changes: Source/Checks/cm_cxx_features.cmake |4 Source/Checks/cm_cxx_unique_ptr.cxx |6 ++ Source/cmConfigure.cmake.h.in |2 ++ 3 files changed, 12 insertions(+) create mode 100644 Source/Checks/cm_cxx_unique_ptr.cxx 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.6.2-2129-gf9224eb
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 f9224eb7b28c6c6456524906103e7f26b5afe17e (commit) via aa50cdac439121f9e40ff2638368dc913a0e2361 (commit) from 5991d310b7b631ab0716bfb9e182260fe836bd60 (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=f9224eb7b28c6c6456524906103e7f26b5afe17e commit f9224eb7b28c6c6456524906103e7f26b5afe17e Merge: 5991d31 aa50cda Author: Brad King AuthorDate: Fri Sep 16 13:25:05 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 13:25:05 2016 -0400 Merge topic 'check-for-unique_ptr' into next aa50cdac Check for availability of unique_ptr and make_unique when building CMake https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa50cdac439121f9e40ff2638368dc913a0e2361 commit aa50cdac439121f9e40ff2638368dc913a0e2361 Author: Brad King AuthorDate: Fri Sep 16 13:21:10 2016 -0400 Commit: Brad King CommitDate: Fri Sep 16 13:22:10 2016 -0400 Check for availability of unique_ptr and make_unique when building CMake Some code paths may find these useful if available. diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake index 6fde7b6..c6a532f 100644 --- a/Source/Checks/cm_cxx_features.cmake +++ b/Source/Checks/cm_cxx_features.cmake @@ -32,8 +32,13 @@ function(cm_check_cxx_feature name) endfunction() if(CMAKE_CXX_STANDARD) + cm_check_cxx_feature(make_unique) + if(CMake_HAVE_CXX_MAKE_UNIQUE) +set(CMake_HAVE_CXX_UNIQUE_PTR 1) + endif() cm_check_cxx_feature(nullptr) cm_check_cxx_feature(override) + cm_check_cxx_feature(unique_ptr) cm_check_cxx_feature(unordered_map) cm_check_cxx_feature(unordered_set) endif() diff --git a/Source/Checks/cm_cxx_make_unique.cxx b/Source/Checks/cm_cxx_make_unique.cxx new file mode 100644 index 000..a3ff68f --- /dev/null +++ b/Source/Checks/cm_cxx_make_unique.cxx @@ -0,0 +1,6 @@ +#include +int main() +{ + std::unique_ptr u = std::make_unique(0); + return *u; +} diff --git a/Source/Checks/cm_cxx_unique_ptr.cxx b/Source/Checks/cm_cxx_unique_ptr.cxx new file mode 100644 index 000..a9d4ce5 --- /dev/null +++ b/Source/Checks/cm_cxx_unique_ptr.cxx @@ -0,0 +1,6 @@ +#include +int main() +{ + std::unique_ptr u(new int(0)); + return *u; +} diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index ccea22d..8365367 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -30,8 +30,10 @@ #cmakedefine CMAKE_USE_MACH_PARSER #cmakedefine CMAKE_USE_LIBUV #cmakedefine CMAKE_ENCODING_UTF8 +#cmakedefine CMake_HAVE_CXX_MAKE_UNIQUE #cmakedefine CMake_HAVE_CXX_NULLPTR #cmakedefine CMake_HAVE_CXX_OVERRIDE +#cmakedefine CMake_HAVE_CXX_UNIQUE_PTR #cmakedefine CMake_HAVE_CXX_UNORDERED_MAP #cmakedefine CMake_HAVE_CXX_UNORDERED_SET #define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@" --- Summary of changes: 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.6.2-2125-gf5db532
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 f5db532193c0e1396286ba4bb796f4be38e3a420 (commit) via 58a3e2d186d1a7c94d1a94ae0cc9b80c86c57aa2 (commit) from b9ddf9801cb6b481ed076aa63b7dc8e619633115 (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=f5db532193c0e1396286ba4bb796f4be38e3a420 commit f5db532193c0e1396286ba4bb796f4be38e3a420 Merge: b9ddf98 58a3e2d Author: Brad King AuthorDate: Fri Sep 16 13:07:38 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 13:07:38 2016 -0400 Merge topic 'cmake-server-basic' into next 58a3e2d1 fixup! cmake-server: Bare-bones server implementation https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58a3e2d186d1a7c94d1a94ae0cc9b80c86c57aa2 commit 58a3e2d186d1a7c94d1a94ae0cc9b80c86c57aa2 Author: Brad King AuthorDate: Fri Sep 16 13:04:16 2016 -0400 Commit: Brad King CommitDate: Fri Sep 16 13:04:16 2016 -0400 fixup! cmake-server: Bare-bones server implementation diff --git a/CMakeLists.txt b/CMakeLists.txt index ce76316..08853c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -708,10 +708,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE AND NOT CMAKE_BOOTSTRAP AND CMAKE_USE_LIBUV) list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_auto_type CMake_HAVE_CXX_AUTO_TYPE) list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_range_for CMake_HAVE_CXX_RANGE_FOR) if(CMake_HAVE_CXX_AUTO_TYPE AND CMake_HAVE_CXX_RANGE_FOR) -include(CheckCXXSourceCompiles) -check_cxx_source_compiles("#include \nint main() { auto u = std::make_unique(0); return *u; }\n" - CMake_HAVE_CXX_UNIQUE_PTR) -if(CMake_HAVE_CXX_UNIQUE_PTR) +if(CMake_HAVE_CXX_MAKE_UNIQUE) set(CMake_HAVE_SERVER_MODE 1) endif() endif() diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake index 6fde7b6..960c106 100644 --- a/Source/Checks/cm_cxx_features.cmake +++ b/Source/Checks/cm_cxx_features.cmake @@ -32,6 +32,7 @@ function(cm_check_cxx_feature name) endfunction() if(CMAKE_CXX_STANDARD) + cm_check_cxx_feature(make_unique) cm_check_cxx_feature(nullptr) cm_check_cxx_feature(override) cm_check_cxx_feature(unordered_map) diff --git a/Source/Checks/cm_cxx_make_unique.cxx b/Source/Checks/cm_cxx_make_unique.cxx new file mode 100644 index 000..a3ff68f --- /dev/null +++ b/Source/Checks/cm_cxx_make_unique.cxx @@ -0,0 +1,6 @@ +#include +int main() +{ + std::unique_ptr u = std::make_unique(0); + return *u; +} --- Summary of changes: CMakeLists.txt |5 + Source/Checks/cm_cxx_features.cmake |1 + Source/Checks/cm_cxx_make_unique.cxx |6 ++ 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 Source/Checks/cm_cxx_make_unique.cxx 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.6.2-2123-gb9ddf98
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 b9ddf9801cb6b481ed076aa63b7dc8e619633115 (commit) via 0310cb1094e198d91e99e4ffd58549c274d4d011 (commit) from a6b04580f92ba926fac8b8feb401413824ee82d2 (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=b9ddf9801cb6b481ed076aa63b7dc8e619633115 commit b9ddf9801cb6b481ed076aa63b7dc8e619633115 Merge: a6b0458 0310cb1 Author: Brad King AuthorDate: Fri Sep 16 12:53:11 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 12:53:11 2016 -0400 Merge topic 'binaries-as-c++14' into next 0310cb10 Utilities/Release: Build Linux and OS X binaries as C++14 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0310cb1094e198d91e99e4ffd58549c274d4d011 commit 0310cb1094e198d91e99e4ffd58549c274d4d011 Author: Brad King AuthorDate: Fri Sep 16 12:52:13 2016 -0400 Commit: Brad King CommitDate: Fri Sep 16 12:52:13 2016 -0400 Utilities/Release: Build Linux and OS X binaries as C++14 The toolchains we use to build on these platforms support it. diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake index 168eb86..e7e154e 100644 --- a/Utilities/Release/linux64_release.cmake +++ b/Utilities/Release/linux64_release.cmake @@ -21,7 +21,7 @@ set(qt_xcb_libs set(INITIAL_CACHE " CMAKE_BUILD_TYPE:STRING=Release CMAKE_C_STANDARD:STRING=11 -CMAKE_CXX_STANDARD:STRING=11 +CMAKE_CXX_STANDARD:STRING=14 CMAKE_C_FLAGS:STRING=-D_POSIX_C_SOURCE=199506L -D_POSIX_SOURCE=1 -D_SVID_SOURCE=1 -D_BSD_SOURCE=1 CMAKE_EXE_LINKER_FLAGS:STRING=-static-libstdc++ -static-libgcc CURSES_LIBRARY:FILEPATH=/home/kitware/ncurses-5.9/lib/libncurses.a diff --git a/Utilities/Release/osx_release.cmake b/Utilities/Release/osx_release.cmake index e7e5ba4..12b12d7 100644 --- a/Utilities/Release/osx_release.cmake +++ b/Utilities/Release/osx_release.cmake @@ -14,7 +14,7 @@ set(CXXFLAGS "-stdlib=libc++") set(INITIAL_CACHE " CMAKE_BUILD_TYPE:STRING=Release CMAKE_C_STANDARD:STRING=11 -CMAKE_CXX_STANDARD:STRING=11 +CMAKE_CXX_STANDARD:STRING=14 CMAKE_OSX_ARCHITECTURES:STRING=x86_64 CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE --- Summary of changes: Utilities/Release/linux64_release.cmake |2 +- Utilities/Release/osx_release.cmake |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.6.2-2121-ga6b0458
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 a6b04580f92ba926fac8b8feb401413824ee82d2 (commit) via 7b30345dee7903d3793a79f9dc5db620ef95de87 (commit) from 90c30da30240895a3cf717c7248b84f485771194 (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=a6b04580f92ba926fac8b8feb401413824ee82d2 commit a6b04580f92ba926fac8b8feb401413824ee82d2 Merge: 90c30da 7b30345 Author: Brad King AuthorDate: Fri Sep 16 11:57:18 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 11:57:18 2016 -0400 Merge topic 'cmake-server-basic' into next 7b30345d fixup! cmake-server: Bare-bones server implementation https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b30345dee7903d3793a79f9dc5db620ef95de87 commit 7b30345dee7903d3793a79f9dc5db620ef95de87 Author: Brad King AuthorDate: Fri Sep 16 11:55:50 2016 -0400 Commit: Brad King CommitDate: Fri Sep 16 11:56:59 2016 -0400 fixup! cmake-server: Bare-bones server implementation diff --git a/CMakeLists.txt b/CMakeLists.txt index 04ce209..ce76316 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -703,12 +703,18 @@ endif() CMAKE_SETUP_TESTING() # Check whether to build server mode or not: -list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_auto_type CMake_HAVE_CXX_AUTO_TYPE) -list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_range_for CMake_HAVE_CXX_RANGE_FOR) -if(NOT CMake_TEST_EXTERNAL_CMAKE AND NOT CMAKE_BOOTSTRAP AND CMake_HAVE_CXX_AUTO_TYPE AND CMake_HAVE_CXX_RANGE_FOR AND CMAKE_USE_LIBUV) - set(CMake_HAVE_SERVER_MODE 1) -else() - set(CMake_HAVE_SERVER_MODE 0) +set(CMake_HAVE_SERVER_MODE 0) +if(NOT CMake_TEST_EXTERNAL_CMAKE AND NOT CMAKE_BOOTSTRAP AND CMAKE_USE_LIBUV) + list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_auto_type CMake_HAVE_CXX_AUTO_TYPE) + list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_range_for CMake_HAVE_CXX_RANGE_FOR) + if(CMake_HAVE_CXX_AUTO_TYPE AND CMake_HAVE_CXX_RANGE_FOR) +include(CheckCXXSourceCompiles) +check_cxx_source_compiles("#include \nint main() { auto u = std::make_unique(0); return *u; }\n" + CMake_HAVE_CXX_UNIQUE_PTR) +if(CMake_HAVE_CXX_UNIQUE_PTR) + set(CMake_HAVE_SERVER_MODE 1) +endif() + endif() endif() if(NOT CMake_TEST_EXTERNAL_CMAKE) --- Summary of changes: CMakeLists.txt | 18 -- 1 file changed, 12 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, next, updated. v3.6.2-2119-g90c30da
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 90c30da30240895a3cf717c7248b84f485771194 (commit) via a1eca1500dcbac9eea6d8dd5e2f8c77b8fd30dd8 (commit) via df86dcfb2054bbde8382d3d9dd34ef98bfc73412 (commit) via 359bc8a176a8a8b8026fd078e075fd9cdc00b103 (commit) via 85e43143d7ec8a8b04a1cc2d74649dbdf4e08b35 (commit) via d23543af4435e56da3373dcaf53f5b61fcd831c1 (commit) from fcbed9bc37a32ad48dbf6839d020c55cc749310b (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=90c30da30240895a3cf717c7248b84f485771194 commit 90c30da30240895a3cf717c7248b84f485771194 Merge: fcbed9b a1eca15 Author: Brad King AuthorDate: Fri Sep 16 11:29:50 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 11:29:50 2016 -0400 Merge topic 'cmake-server-basic' into next a1eca150 cmake-server: Add documentation df86dcfb cmake-server: Add unit test 359bc8a1 cmake-server: Implement ServerProtocol 1.0 85e43143 cmake-server: Bare-bones server implementation d23543af cmake-server: Report server mode availablitily in Capabilities https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1eca1500dcbac9eea6d8dd5e2f8c77b8fd30dd8 commit a1eca1500dcbac9eea6d8dd5e2f8c77b8fd30dd8 Author: Tobias Hunger AuthorDate: Tue Sep 13 10:57:06 2016 +0200 Commit: Brad King CommitDate: Fri Sep 16 11:20:04 2016 -0400 cmake-server: Add documentation diff --git a/Help/index.rst b/Help/index.rst index 2d3f156..97cd107 100644 --- a/Help/index.rst +++ b/Help/index.rst @@ -32,6 +32,7 @@ Reference Manuals /manual/cmake-generator-expressions.7 /manual/cmake-generators.7 /manual/cmake-language.7 + /manual/cmake-server.7 /manual/cmake-modules.7 /manual/cmake-packages.7 /manual/cmake-policies.7 diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst new file mode 100644 index 000..fd0c9ee --- /dev/null +++ b/Help/manual/cmake-server.7.rst @@ -0,0 +1,188 @@ +.. cmake-manual-description: CMake Server + +cmake-server(7) +*** + +.. only:: html + + .. contents:: + +Introduction + + +:manual:`cmake(1)` is capable of providing semantic information about +CMake code it executes to generate a buildsystem. If executed with +the ``-E server`` command line options, it starts in a long running mode +and allows a client to request the available information via a JSON protocol. + +The protocol is designed to be useful to IDEs, refactoring tools, and +other tools which have a need to understand the buildsystem in entirety. + +A single :manual:`cmake-buildsystem(7)` may describe buildsystem contents +and build properties which differ based on +:manual:`generation-time context ` +including: + +* The Platform (eg, Windows, APPLE, Linux). +* The build configuration (eg, Debug, Release, Coverage). +* The Compiler (eg, MSVC, GCC, Clang) and compiler version. +* The language of the source files compiled. +* Available compile features (eg CXX variadic templates). +* CMake policies. + +The protocol aims to provide information to tooling to satisfy several +needs: + +#. Provide a complete and easily parsed source of all information relevant + to the tooling as it relates to the source code. There should be no need + for tooling to parse generated buildsystems to access include directories + or compile definitions for example. +#. Semantic information about the CMake buildsystem itself. +#. Provide a stable interface for reading the information in the CMake cache. +#. Information for determining when cmake needs to be re-run as a result of + file changes. + + +Operation += + +Start :manual:`cmake(1)` in the server command mode, supplying the path to +the build directory to process:: + + cmake -E server + +The server will start up and reply with an hello message on stdout:: + + [== CMake Server ==[ + {"supportedProtocolVersions":[{"major":0,"minor":1}],"type":"hello"} + ]== CMake Server ==] + +Messages sent to and from the process are wrapped in magic strings:: + + [== CMake Server ==[ + { +... some JSON message ... + } + ]== CMake Server ==] + +The server is now ready to accept further requests via stdin. + + +Protocol API + + + +General Message Layout +-- + +All messages need to have a "type" value, which identifies the type of +message that is passed back or forth. E.g. the initial message sent by the +server is of type "hello". Messages without a type will generate an response +of type "error". + +All requests sent to the server may contain a "cookie" value. This valu
[Cmake-commits] CMake branch, next, updated. v3.6.2-2113-gfcbed9b
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 fcbed9bc37a32ad48dbf6839d020c55cc749310b (commit) via a327b20694f81c281b2f803acf75a73b95eeb76b (commit) from 01ee277892e7846f2998f8101d4ea40596dcdc26 (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=fcbed9bc37a32ad48dbf6839d020c55cc749310b commit fcbed9bc37a32ad48dbf6839d020c55cc749310b Merge: 01ee277 a327b20 Author: Brad King AuthorDate: Fri Sep 16 10:41:16 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 10:41:16 2016 -0400 Merge topic 'doc-CPackIFW' into next a327b206 CPackIFW: Format documentation https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a327b20694f81c281b2f803acf75a73b95eeb76b commit a327b20694f81c281b2f803acf75a73b95eeb76b Author: Brad King AuthorDate: Fri Sep 16 10:40:03 2016 -0400 Commit: Brad King CommitDate: Fri Sep 16 10:40:17 2016 -0400 CPackIFW: Format documentation Place command documentation in explicit markup blocks and remove horizontal dividers. Use definition lists and bullet lists as appropriate. diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake index c502099..36fc276 100644 --- a/Modules/CPackIFW.cmake +++ b/Modules/CPackIFW.cmake @@ -181,142 +181,161 @@ # # The module defines the following commands: # -# -- -# # .. command:: cpack_ifw_configure_component # -# Sets the arguments specific to the CPack IFW generator. +# Sets the arguments specific to the CPack IFW generator. # -# :: +# :: # -# cpack_ifw_configure_component( [COMMON] [ESSENTIAL] -# [NAME ] -# [VERSION ] -# [SCRIPT
[Cmake-commits] CMake branch, next, updated. v3.6.2-2111-g01ee277
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 01ee277892e7846f2998f8101d4ea40596dcdc26 (commit) via c2f0f41f6372a6a810f43cab3ebba70261231c70 (commit) from 56f7811ded77e0bed029b0232655ed4d4f4971d5 (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=01ee277892e7846f2998f8101d4ea40596dcdc26 commit 01ee277892e7846f2998f8101d4ea40596dcdc26 Merge: 56f7811 c2f0f41 Author: Brad King AuthorDate: Fri Sep 16 10:41:05 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 10:41:05 2016 -0400 Merge topic 'ifw-user-interfaces' into next c2f0f41f CPackIFW: Add USER_INTERFACES option https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2f0f41f6372a6a810f43cab3ebba70261231c70 commit c2f0f41f6372a6a810f43cab3ebba70261231c70 Author: Pierluigi Taddei AuthorDate: Thu Sep 15 21:26:52 2016 +0200 Commit: Brad King CommitDate: Fri Sep 16 10:29:00 2016 -0400 CPackIFW: Add USER_INTERFACES option Add to CPackIFW the capability of accepting a list of USER_INTERFACES that are copied to the meta folder and added to the component description. diff --git a/Help/release/dev/ifw-user-interfaces.rst b/Help/release/dev/ifw-user-interfaces.rst new file mode 100644 index 000..26e241a --- /dev/null +++ b/Help/release/dev/ifw-user-interfaces.rst @@ -0,0 +1,7 @@ +ifw-user-interfaces +--- + +* The :module:`CPackIFW` module :command:`cpack_ifw_configure_component` and + :command:`cpack_ifw_configure_component_group` commands gained a new + ``USER_INTERFACES`` option to add a list of additonal pages to the IFW + installer. diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake index ebc5c90..c502099 100644 --- a/Modules/CPackIFW.cmake +++ b/Modules/CPackIFW.cmake @@ -195,7 +195,8 @@ # [SCRIPT
[Cmake-commits] CMake branch, next, updated. v3.6.2-2109-g56f7811
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 56f7811ded77e0bed029b0232655ed4d4f4971d5 (commit) via 00fd64d1263901f96935e15c8d90ee8a338cee1a (commit) via 60ebd0acf843bbe87f94b39d6807a072532cdb07 (commit) via cf0e005202b3d17ad1f3c17536065c5589b97f93 (commit) via 4356bd7fe382585e59033287dcc43386689e5dc2 (commit) via 38a378e10d93740c11ac713c6035e26d6838ad96 (commit) via 3efb3c0012a05ce1f19c99fb27b835c3ec057270 (commit) via 6f1b80bec03fbe19e3d8f56fdee84a8ca6e4fe93 (commit) via 554655bfd91450e7e4e7feb9bd3a383d769a5528 (commit) from 48c68b9b5e6a1be92dcaaab66a53d11643ecb7b2 (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=56f7811ded77e0bed029b0232655ed4d4f4971d5 commit 56f7811ded77e0bed029b0232655ed4d4f4971d5 Merge: 48c68b9 00fd64d Author: Brad King AuthorDate: Fri Sep 16 10:21:57 2016 -0400 Commit: Brad King CommitDate: Fri Sep 16 10:21:57 2016 -0400 Merge branch 'master' into next --- Summary of changes: 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.6.2-1007-g60ebd0a
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 60ebd0acf843bbe87f94b39d6807a072532cdb07 (commit) via 73f648f167e9b11739c4dbbdbd5c024baf1e39ad (commit) from cf0e005202b3d17ad1f3c17536065c5589b97f93 (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=60ebd0acf843bbe87f94b39d6807a072532cdb07 commit 60ebd0acf843bbe87f94b39d6807a072532cdb07 Merge: cf0e005 73f648f Author: Brad King AuthorDate: Fri Sep 16 10:21:39 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 10:21:39 2016 -0400 Merge topic 'size-empty' 73f648f1 use empty method to check for emptyness --- Summary of changes: Source/cmAddCompileOptionsCommand.cxx |2 +- Source/cmAddCustomTargetCommand.cxx |2 +- Source/cmAddDefinitionsCommand.cxx|2 +- Source/cmAddLibraryCommand.cxx|2 +- Source/cmAddSubDirectoryCommand.cxx |2 +- Source/cmBuildCommand.cxx |2 +- Source/cmBuildNameCommand.cxx |2 +- Source/cmCMakePolicyCommand.cxx |2 +- Source/cmConditionEvaluator.cxx |2 +- Source/cmDefinePropertyCommand.cxx|2 +- Source/cmEnableLanguageCommand.cxx|2 +- Source/cmExecProgramCommand.cxx |2 +- Source/cmExecuteProcessCommand.cxx|2 +- Source/cmExportBuildAndroidMKGenerator.cxx|2 +- Source/cmExportInstallAndroidMKGenerator.cxx |4 ++-- Source/cmExportLibraryDependenciesCommand.cxx |2 +- Source/cmFindPackageCommand.cxx |2 +- Source/cmForEachCommand.cxx |2 +- Source/cmFunctionCommand.cxx |2 +- Source/cmIncludeCommand.cxx |2 +- Source/cmIncludeDirectoryCommand.cxx |2 +- Source/cmIncludeRegularExpressionCommand.cxx |2 +- Source/cmLinkDirectoriesCommand.cxx |2 +- Source/cmLinkLibrariesCommand.cxx |2 +- Source/cmLinkedTree.h |4 ++-- Source/cmLoadCacheCommand.cxx |2 +- Source/cmLoadCommandCommand.cxx |2 +- Source/cmMacroCommand.cxx |2 +- Source/cmMarkAsAdvancedCommand.cxx|2 +- Source/cmMathCommand.cxx |2 +- Source/cmMessageCommand.cxx |2 +- Source/cmProjectCommand.cxx |2 +- Source/cmRemoveCommand.cxx|2 +- Source/cmRemoveDefinitionsCommand.cxx |2 +- Source/cmSetCommand.cxx |2 +- Source/cmSetDirectoryPropertiesCommand.cxx|2 +- Source/cmSetTestsPropertiesCommand.cxx|2 +- Source/cmSourceGroupCommand.cxx |2 +- Source/cmStringCommand.cxx|2 +- Source/cmSubdirCommand.cxx|2 +- Source/cmTargetLinkLibrariesCommand.cxx |2 +- Source/cmUnsetCommand.cxx |2 +- Source/cmVariableWatchCommand.cxx |2 +- Source/cmWhileCommand.cxx |2 +- 44 files changed, 46 insertions(+), 46 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.6.2-999-g3efb3c0
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 3efb3c0012a05ce1f19c99fb27b835c3ec057270 (commit) via 9cbd04be5fa86c2363c7c7f65b6a00969bc87d1d (commit) via e1ca117332fbf6adf3a467a420804e9cb1891582 (commit) from 6f1b80bec03fbe19e3d8f56fdee84a8ca6e4fe93 (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=3efb3c0012a05ce1f19c99fb27b835c3ec057270 commit 3efb3c0012a05ce1f19c99fb27b835c3ec057270 Merge: 6f1b80b 9cbd04b Author: Brad King AuthorDate: Fri Sep 16 10:21:11 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 10:21:11 2016 -0400 Merge topic 'ExternalProject-http-credentials' 9cbd04be Help: Add notes for topic 'ExternalProject-http-credentials' e1ca1173 ExternalProject: Add HTTP_{USERNAME,PASSWORD} --- Summary of changes: Auxiliary/vim/syntax/cmake.vim|2 +- Help/release/dev/ExternalProject-http-credentials.rst |5 + Modules/ExternalProject-download.cmake.in |1 + Modules/ExternalProject.cmake | 17 +++-- 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 Help/release/dev/ExternalProject-http-credentials.rst 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.6.2-1001-g38a378e
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 38a378e10d93740c11ac713c6035e26d6838ad96 (commit) via 31be918b0b2dd445bdf85d72a8eaa29841137bc8 (commit) from 3efb3c0012a05ce1f19c99fb27b835c3ec057270 (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=38a378e10d93740c11ac713c6035e26d6838ad96 commit 38a378e10d93740c11ac713c6035e26d6838ad96 Merge: 3efb3c0 31be918 Author: Brad King AuthorDate: Fri Sep 16 10:21:17 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 10:21:17 2016 -0400 Merge topic 'find_package-dir-sort' 31be918b find_package: Optionally sort globbed directories in a meaningful order --- Summary of changes: Help/command/find_package.rst | 18 ++- Help/manual/cmake-variables.7.rst |2 + Help/release/dev/find_package-dir-sort.rst | 13 +++ .../variable/CMAKE_FIND_PACKAGE_SORT_DIRECTION.rst | 16 +++ Help/variable/CMAKE_FIND_PACKAGE_SORT_ORDER.rst| 36 ++ Source/cmFindPackageCommand.cxx| 118 +--- Source/cmFindPackageCommand.h | 26 + Tests/CMakeLib/CMakeLists.txt |1 + Tests/CMakeLib/testFindPackageCommand.cxx | 76 + Tests/FindPackageTest/CMakeLists.txt | 30 + .../SortLib-3.1.1/SortLibConfig.cmake |2 + .../SortLib-3.1.1/SortLibConfigVersion.cmake |9 ++ .../SortLib-3.10.1/SortLibConfig.cmake |2 + .../SortLib-3.10.1/SortLibConfigVersion.cmake |9 ++ 14 files changed, 341 insertions(+), 17 deletions(-) create mode 100644 Help/release/dev/find_package-dir-sort.rst create mode 100644 Help/variable/CMAKE_FIND_PACKAGE_SORT_DIRECTION.rst create mode 100644 Help/variable/CMAKE_FIND_PACKAGE_SORT_ORDER.rst create mode 100644 Tests/CMakeLib/testFindPackageCommand.cxx create mode 100644 Tests/FindPackageTest/SortLib-3.1.1/SortLibConfig.cmake create mode 100644 Tests/FindPackageTest/SortLib-3.1.1/SortLibConfigVersion.cmake create mode 100644 Tests/FindPackageTest/SortLib-3.10.1/SortLibConfig.cmake create mode 100644 Tests/FindPackageTest/SortLib-3.10.1/SortLibConfigVersion.cmake 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.6.2-1011-g00fd64d
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 00fd64d1263901f96935e15c8d90ee8a338cee1a (commit) via 9353d991a4a9df1c7bdededaf0b11fc96227f805 (commit) via fa3897b24eb9a5cbc4926659b11f8cb6087789a1 (commit) via 916d84450d2caa7cadc82662039602849cdb118d (commit) from 60ebd0acf843bbe87f94b39d6807a072532cdb07 (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=00fd64d1263901f96935e15c8d90ee8a338cee1a commit 00fd64d1263901f96935e15c8d90ee8a338cee1a Merge: 60ebd0a 9353d99 Author: Brad King AuthorDate: Fri Sep 16 10:21:43 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 10:21:43 2016 -0400 Merge topic 'refactor-target-construction' 9353d991 cmTarget: Remove unused support for partial construction fa3897b2 cmGlobalGenerator: Refactor global target construction 916d8445 cmGlobalGenerator: Split CreateDefaultGlobalTargets implementation --- Summary of changes: Source/cmGlobalGenerator.cxx | 254 +- Source/cmGlobalGenerator.h | 29 - Source/cmTarget.cxx | 23 +--- Source/cmTarget.h|5 - 4 files changed, 154 insertions(+), 157 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.6.2-1003-g4356bd7
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 4356bd7fe382585e59033287dcc43386689e5dc2 (commit) via 8f6cb36695df3ded9e242c35c4b0e79850d24a31 (commit) from 38a378e10d93740c11ac713c6035e26d6838ad96 (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=4356bd7fe382585e59033287dcc43386689e5dc2 commit 4356bd7fe382585e59033287dcc43386689e5dc2 Merge: 38a378e 8f6cb36 Author: Brad King AuthorDate: Fri Sep 16 10:21:23 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 10:21:23 2016 -0400 Merge topic 'file-curl-httpheader' 8f6cb366 file(DOWNLOAD|UPLOAD): Add HTTPHEADER suboption --- Summary of changes: Help/command/file.rst |3 ++ Help/release/dev/file-curl-httpheader.rst |5 +++ Source/cmFileCommand.cxx | 36 .../DOWNLOAD-httpheader-not-set-result.txt}|0 .../file/DOWNLOAD-httpheader-not-set-stderr.txt|4 +++ .../file/DOWNLOAD-httpheader-not-set.cmake |1 + Tests/RunCMake/file/RunCMakeTest.cmake |2 ++ .../UPLOAD-httpheader-not-set-result.txt} |0 .../file/UPLOAD-httpheader-not-set-stderr.txt |4 +++ .../RunCMake/file/UPLOAD-httpheader-not-set.cmake |1 + 10 files changed, 56 insertions(+) create mode 100644 Help/release/dev/file-curl-httpheader.rst copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => file/DOWNLOAD-httpheader-not-set-result.txt} (100%) create mode 100644 Tests/RunCMake/file/DOWNLOAD-httpheader-not-set-stderr.txt create mode 100644 Tests/RunCMake/file/DOWNLOAD-httpheader-not-set.cmake copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => file/UPLOAD-httpheader-not-set-result.txt} (100%) create mode 100644 Tests/RunCMake/file/UPLOAD-httpheader-not-set-stderr.txt create mode 100644 Tests/RunCMake/file/UPLOAD-httpheader-not-set.cmake 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.6.2-996-g6f1b80b
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 6f1b80bec03fbe19e3d8f56fdee84a8ca6e4fe93 (commit) via a788cf309257ee0a9cd8cdd1ed5d4665d34a9580 (commit) from 554655bfd91450e7e4e7feb9bd3a383d769a5528 (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=6f1b80bec03fbe19e3d8f56fdee84a8ca6e4fe93 commit 6f1b80bec03fbe19e3d8f56fdee84a8ca6e4fe93 Merge: 554655b a788cf3 Author: Brad King AuthorDate: Fri Sep 16 10:20:57 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 10:20:57 2016 -0400 Merge topic 'file-LOCK-lowercase-test' a788cf30 Tests: Add case for file(LOCK) with lower-cased path --- Summary of changes: Tests/RunCMake/file/LOCK-lowercase.cmake | 11 +++ Tests/RunCMake/file/RunCMakeTest.cmake |1 + 2 files changed, 12 insertions(+) create mode 100644 Tests/RunCMake/file/LOCK-lowercase.cmake 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.6.2-994-g554655b
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 554655bfd91450e7e4e7feb9bd3a383d769a5528 (commit) via ae783c9ba92f42ec252085e407c0b7e5d00aa59a (commit) from 3bb18e708da186927f59bbc94875e27b57278fcf (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=554655bfd91450e7e4e7feb9bd3a383d769a5528 commit 554655bfd91450e7e4e7feb9bd3a383d769a5528 Merge: 3bb18e7 ae783c9 Author: Brad King AuthorDate: Fri Sep 16 10:20:48 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 10:20:48 2016 -0400 Merge topic 'require-cmake-2.8.12.2' ae783c9b Require CMake 2.8.12.2 to build CMake itself --- Summary of changes: CMakeLists.txt |2 +- Utilities/Doxygen/CMakeLists.txt |2 +- Utilities/Sphinx/CMakeLists.txt |2 +- 3 files changed, 3 insertions(+), 3 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.6.2-1005-gcf0e005
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 cf0e005202b3d17ad1f3c17536065c5589b97f93 (commit) via 72dfca30b94ba1e85533c61a7b5a330dfbc04da5 (commit) from 4356bd7fe382585e59033287dcc43386689e5dc2 (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=cf0e005202b3d17ad1f3c17536065c5589b97f93 commit cf0e005202b3d17ad1f3c17536065c5589b97f93 Merge: 4356bd7 72dfca3 Author: Brad King AuthorDate: Fri Sep 16 10:21:31 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 10:21:31 2016 -0400 Merge topic 'detect-relink-incompat' 72dfca30 ninja: error out on relink requirements --- Summary of changes: Source/cmGeneratorTarget.cxx | 23 ++- 1 file changed, 22 insertions(+), 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.6.2-2100-g48c68b9
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 48c68b9b5e6a1be92dcaaab66a53d11643ecb7b2 (commit) via a098ca0d7ac25455a9a1304ecedb8fd8790c6ca7 (commit) via d9c600c504408c79393b9f5b4e334cecca30e67a (commit) via 3bb18e708da186927f59bbc94875e27b57278fcf (commit) from cafd74b307f291f13ac950a3cb671c758676f0ad (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=48c68b9b5e6a1be92dcaaab66a53d11643ecb7b2 commit 48c68b9b5e6a1be92dcaaab66a53d11643ecb7b2 Merge: cafd74b a098ca0 Author: Brad King AuthorDate: Fri Sep 16 10:06:27 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 16 10:06:27 2016 -0400 Merge topic 'find-package-mode-fixes' into next a098ca0d cmake: Fix --find-package mode link line output d9c600c5 cmGlobalGenerator: Fix use of uninitialized value in --find-package mode 3bb18e70 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a098ca0d7ac25455a9a1304ecedb8fd8790c6ca7 commit a098ca0d7ac25455a9a1304ecedb8fd8790c6ca7 Author: Brad King AuthorDate: Fri Sep 16 09:49:25 2016 -0400 Commit: Brad King CommitDate: Fri Sep 16 10:03:15 2016 -0400 cmake: Fix --find-package mode link line output Refactoring in commit v2.8.10~58^2~2 (Ninja: move -LIBPATH behind -link option, 2012-09-26) added arguments to cmLocalGenerator::GetTargetFlags and updated the call sites. However, in the cmake::FindPackage and cmLocalGenerator::AddBuildTargetRule call sites it added the new arguments in the wrong order. The latter was never used and has been removed. The former remains buggy and prints out compiler flags instead of the link framework/library search paths. Fix its argument order. diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 18a7894..112a5f7 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -595,8 +595,8 @@ bool cmake::FindPackage(const std::vector& args) gg->CreateGenerationObjects(); cmGeneratorTarget* gtgt = gg->FindGeneratorTarget(tgt->GetName()); cmLocalGenerator* lg = gtgt->GetLocalGenerator(); -lg->GetTargetFlags(buildType, linkLibs, frameworkPath, linkPath, flags, - linkFlags, gtgt, false); +lg->GetTargetFlags(buildType, linkLibs, flags, linkFlags, frameworkPath, + linkPath, gtgt, false); linkLibs = frameworkPath + linkPath + linkLibs; printf("%s\n", linkLibs.c_str()); https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9c600c504408c79393b9f5b4e334cecca30e67a commit d9c600c504408c79393b9f5b4e334cecca30e67a Author: Brad King AuthorDate: Fri Sep 16 09:25:41 2016 -0400 Commit: Brad King CommitDate: Fri Sep 16 09:25:41 2016 -0400 cmGlobalGenerator: Fix use of uninitialized value in --find-package mode diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index e85d80e..3d2b60e 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -94,6 +94,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm) this->TryCompileOuterMakefile = CM_NULLPTR; this->ConfigureDoneCMP0026AndCMP0024 = false; + this->FirstTimeProgress = 0.0f; cm->GetState()->SetMinGWMake(false); cm->GetState()->SetMSYSShell(false); --- Summary of changes: Source/CMakeVersion.cmake|2 +- Source/cmGlobalGenerator.cxx |1 + Source/cmake.cxx |4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits