[Cmake-commits] CMake branch, master, updated. v3.15.0-rc1-64-gd24121d
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 d24121d62518d4ce8672737d83ef448e8b2a0ae6 (commit) from f07200fe163640f708c62de3cbdc0fb49a7e0471 (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=d24121d62518d4ce8672737d83ef448e8b2a0ae6 commit d24121d62518d4ce8672737d83ef448e8b2a0ae6 Author: Kitware Robot AuthorDate: Thu Jun 13 00:01:08 2019 -0400 Commit: Kitware Robot CommitDate: Thu Jun 13 00:01:08 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 55e4455..63cb1c6 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 15) -set(CMake_VERSION_PATCH 20190612) +set(CMake_VERSION_PATCH 20190613) #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 https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.15.0-rc1-63-gf07200f
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 f07200fe163640f708c62de3cbdc0fb49a7e0471 (commit)
via c1580ecc13cf2dea3f047d1018e705bd34cecc53 (commit)
via 1af08229a7b871ea592cdf6d2aa41e47787eb713 (commit)
via 00d265e3c812516e2a71faed4f352b36f51112e2 (commit)
via 1b945f95bafc9a795b092904f7c6bd84dad940e8 (commit)
via e0a8ff31480df672e42e2382e8ed7f33ea65afb4 (commit)
via 8d934d861be8c2a8b43d4c421715fb1e8c0c54fd (commit)
via 026f65d284deaea9f2dba41ed956fabf84e17b6d (commit)
via 9e64e617eb295c7e2725d871225659ae7bcf7c48 (commit)
via e791ffac61912f6540742aabaf4cb78a4d475a16 (commit)
via a982916304fc7a66edb7a587144cb192f13ef6be (commit)
from 00132e60a6b85d12a6614d773e8d0d86810ede76 (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=f07200fe163640f708c62de3cbdc0fb49a7e0471
commit f07200fe163640f708c62de3cbdc0fb49a7e0471
Merge: c1580ec e791ffa
Author: Brad King
AuthorDate: Wed Jun 12 16:48:04 2019 +
Commit: Kitware Robot
CommitDate: Wed Jun 12 12:48:13 2019 -0400
Merge topic 'add-test-command-expand-lists'
e791ffac61 add_test: Add COMMAND_EXPAND_LISTS option
Acked-by: Kitware Robot
Merge-request: !3422
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1580ecc13cf2dea3f047d1018e705bd34cecc53
commit c1580ecc13cf2dea3f047d1018e705bd34cecc53
Merge: 1af0822 00d265e
Author: Brad King
AuthorDate: Wed Jun 12 16:45:55 2019 +
Commit: Kitware Robot
CommitDate: Wed Jun 12 12:46:18 2019 -0400
Merge topic 'cmPropertyMap_unordered_map'
00d265e3c8 cmPropertyMap: Use std::unordered_map as container instead of
std::map
1b945f95ba cmPropertyMap: Add RemoveProperty method
e0a8ff3148 cmPropertyMap: Use std::string as value container class
8d934d861b cmPropertyMap: Make std::map container private
026f65d284 cmPropertyMap: Add GetList method
9e64e617eb cmPropertyMap: Rename GetPropertyList method to GetKeys
Acked-by: Kitware Robot
Merge-request: !3435
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1af08229a7b871ea592cdf6d2aa41e47787eb713
commit 1af08229a7b871ea592cdf6d2aa41e47787eb713
Merge: 00132e6 a982916
Author: Brad King
AuthorDate: Wed Jun 12 16:44:56 2019 +
Commit: Kitware Robot
CommitDate: Wed Jun 12 12:45:15 2019 -0400
Merge topic 'language-dependent-linker-flags'
a982916304 Support per-language library link flags
Acked-by: Kitware Robot
Merge-request: !3429
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00d265e3c812516e2a71faed4f352b36f51112e2
commit 00d265e3c812516e2a71faed4f352b36f51112e2
Author: Sebastian Holtermann
AuthorDate: Mon Jun 3 10:29:12 2019 +0200
Commit: Sebastian Holtermann
CommitDate: Sat Jun 8 12:25:35 2019 +0200
cmPropertyMap: Use std::unordered_map as container instead of std::map
diff --git a/Source/cmPropertyMap.cxx b/Source/cmPropertyMap.cxx
index 64bceb5..3ed4c05 100644
--- a/Source/cmPropertyMap.cxx
+++ b/Source/cmPropertyMap.cxx
@@ -2,6 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmPropertyMap.h"
+#include
#include
void cmPropertyMap::Clear()
@@ -59,15 +60,21 @@ std::vector cmPropertyMap::GetKeys() const
for (auto const& item : Map_) {
keyList.push_back(item.first);
}
+ std::sort(keyList.begin(), keyList.end());
return keyList;
}
std::vector> cmPropertyMap::GetList() const
{
- std::vector> kvList;
+ typedef std::pair StringPair;
+ std::vector kvList;
kvList.reserve(Map_.size());
for (auto const& item : Map_) {
kvList.emplace_back(item.first, item.second);
}
+ std::sort(kvList.begin(), kvList.end(),
+[](StringPair const& a, StringPair const& b) {
+ return a.first < b.first;
+});
return kvList;
}
diff --git a/Source/cmPropertyMap.h b/Source/cmPropertyMap.h
index 6284e8c..9aed349 100644
--- a/Source/cmPropertyMap.h
+++ b/Source/cmPropertyMap.h
@@ -5,11 +5,14 @@
#include "cmConfigure.h" // IWYU pragma: keep
-#include
#include
+#include
#include
#include
+/** \class cmPropertyMap
+ * \brief String property map.
+ */
class cmPropertyMap
{
public:
@@ -34,6 +37,7 @@ public:
void RemoveProperty(const std::string& name);
// -- Lists
+
//! Get a sorted list of property keys
std::vector GetKeys() const;
@@ -41,7 +45,7 @@ public:
std::vector> GetList() const;
private:
- std::map Map_;
+ std::unordered_map Map_;
};
#endif
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b945f
[Cmake-commits] CMake branch, release, updated. v3.15.0-rc1-17-g069e42f
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, release has been updated via 069e42f7c34e1a721fcc6101ba2f6827e07e855a (commit) via f26c3d5c6056f6920f6082b97e06d55c34ddfbcf (commit) via fa00a3b29bdc962429af13c64f11b51fee8c58bb (commit) via c932f498426609beb14b9339c2a7dec3ea624998 (commit) via 6696855f72adebbb40d475c39dace1e9f855ca2a (commit) via 6b815e58baa037335fb0008f6d0345fa29931e08 (commit) from 8d3c919a3cbef7d92f24409fa7a5737e835957ee (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 - --- Summary of changes: Help/manual/cmake-file-api.7.rst | 2 + Help/manual/cmake.1.rst| 16 ++ Modules/CheckCXXSymbolExists.cmake | 2 +- Source/cmFileAPI.cxx | 63 +- Source/cmFileAPI.h | 5 ++ Source/cmServerProtocol.cxx| 2 +- Source/cmake.cxx | 9 ++-- Source/cmake.h | 4 +- Source/cmcmd.cxx | 6 +-- .../RunCMake/CommandLine/E_capabilities-stdout.txt | 2 +- 10 files changed, 83 insertions(+), 28 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.15.0-rc1-52-g00132e6
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 00132e60a6b85d12a6614d773e8d0d86810ede76 (commit) via 069e42f7c34e1a721fcc6101ba2f6827e07e855a (commit) via 445c7bc219aeeb2c8684ba920bec0bd05db915d2 (commit) via f26c3d5c6056f6920f6082b97e06d55c34ddfbcf (commit) via 49b1a2852dc0a3a8b1e98bfc408134a06dba0d67 (commit) via fa00a3b29bdc962429af13c64f11b51fee8c58bb (commit) from 1492dc8301ba5844b830316bcc2677aa1bdae897 (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=00132e60a6b85d12a6614d773e8d0d86810ede76 commit 00132e60a6b85d12a6614d773e8d0d86810ede76 Merge: 445c7bc 069e42f Author: Brad King AuthorDate: Wed Jun 12 11:51:26 2019 -0400 Commit: Brad King CommitDate: Wed Jun 12 11:51:26 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=445c7bc219aeeb2c8684ba920bec0bd05db915d2 commit 445c7bc219aeeb2c8684ba920bec0bd05db915d2 Merge: 49b1a28 f26c3d5 Author: Brad King AuthorDate: Wed Jun 12 15:50:08 2019 + Commit: Kitware Robot CommitDate: Wed Jun 12 11:50:16 2019 -0400 Merge topic 'CheckCXXSymbolExists-xref' f26c3d5c60 CheckCXXSymbolExists: reference to CheckCXXSourceCompiles instead of C version Acked-by: Kitware Robot Merge-request: !3437 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49b1a2852dc0a3a8b1e98bfc408134a06dba0d67 commit 49b1a2852dc0a3a8b1e98bfc408134a06dba0d67 Merge: 1492dc8 fa00a3b Author: Brad King AuthorDate: Wed Jun 12 11:43:20 2019 -0400 Commit: Brad King CommitDate: Wed Jun 12 11:43:20 2019 -0400 Merge branch 'release-3.15' --- Summary of changes: Modules/CheckCXXSymbolExists.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.15.0-rc1-46-g1492dc8
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 1492dc8301ba5844b830316bcc2677aa1bdae897 (commit)
via c932f498426609beb14b9339c2a7dec3ea624998 (commit)
via 6696855f72adebbb40d475c39dace1e9f855ca2a (commit)
via 6b815e58baa037335fb0008f6d0345fa29931e08 (commit)
from b7d72db89de6a9ddc8c8740a6e8b8980d108b900 (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=1492dc8301ba5844b830316bcc2677aa1bdae897
commit 1492dc8301ba5844b830316bcc2677aa1bdae897
Merge: b7d72db c932f49
Author: Brad King
AuthorDate: Wed Jun 12 15:40:33 2019 +
Commit: Kitware Robot
CommitDate: Wed Jun 12 11:40:47 2019 -0400
Merge topic 'capabilities-fileapi'
c932f49842 cmake: Teach -E capabilities to report supported fileapi requests
6696855f72 cmake: Simplify implementation of -E capabilities
6b815e58ba fileapi: Factor out helper to construct a version object
Acked-by: Kitware Robot
Merge-request: !3433
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c932f498426609beb14b9339c2a7dec3ea624998
commit c932f498426609beb14b9339c2a7dec3ea624998
Author: Brad King
AuthorDate: Fri Jun 7 10:22:34 2019 -0400
Commit: Brad King
CommitDate: Fri Jun 7 11:08:38 2019 -0400
cmake: Teach -E capabilities to report supported fileapi requests
Fixes: #19339
diff --git a/Help/manual/cmake-file-api.7.rst b/Help/manual/cmake-file-api.7.rst
index f3e0208..04b6ed2 100644
--- a/Help/manual/cmake-file-api.7.rst
+++ b/Help/manual/cmake-file-api.7.rst
@@ -379,6 +379,8 @@ finds the file missing, that means a concurrent CMake has
generated
a new reply. The client may simply start again by reading the new
reply index file.
+.. _`file-api object kinds`:
+
Object Kinds
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index f1d02eb..13cba71 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -423,6 +423,22 @@ Available commands are:
A list of strings with all the extra generators compatible with
the generator.
+ ``fileApi``
+Optional member that is present when the :manual:`cmake-file-api(7)`
+is available. The value is a JSON object with one member:
+
+``requests``
+ A JSON array containing zero or more supported file-api requests.
+ Each request is a JSON object with members:
+
+ ``kind``
+Specifies one of the supported :ref:`file-api object kinds`.
+
+ ``version``
+A JSON array whose elements are each a JSON object containing
+``major`` and ``minor`` members specifying non-negative integer
+version components.
+
``serverMode``
``true`` if cmake supports server-mode and ``false`` otherwise.
diff --git a/Source/cmFileAPI.cxx b/Source/cmFileAPI.cxx
index 9cb484c..ed45398 100644
--- a/Source/cmFileAPI.cxx
+++ b/Source/cmFileAPI.cxx
@@ -801,3 +801,35 @@ Json::Value cmFileAPI::BuildInternalTest(Object const&
object)
}
return test;
}
+
+Json::Value cmFileAPI::ReportCapabilities()
+{
+ Json::Value capabilities = Json::objectValue;
+ Json::Value& requests = capabilities["requests"] = Json::arrayValue;
+
+ {
+Json::Value request = Json::objectValue;
+request["kind"] = ObjectKindName(ObjectKind::CodeModel);
+Json::Value& versions = request["version"] = Json::arrayValue;
+versions.append(BuildVersion(2, CodeModelV2Minor));
+requests.append(std::move(request));
+ }
+
+ {
+Json::Value request = Json::objectValue;
+request["kind"] = ObjectKindName(ObjectKind::Cache);
+Json::Value& versions = request["version"] = Json::arrayValue;
+versions.append(BuildVersion(2, CacheV2Minor));
+requests.append(std::move(request));
+ }
+
+ {
+Json::Value request = Json::objectValue;
+request["kind"] = ObjectKindName(ObjectKind::CMakeFiles);
+Json::Value& versions = request["version"] = Json::arrayValue;
+versions.append(BuildVersion(1, CMakeFilesV1Minor));
+requests.append(std::move(request));
+ }
+
+ return capabilities;
+}
diff --git a/Source/cmFileAPI.h b/Source/cmFileAPI.h
index 1315532..602efa8 100644
--- a/Source/cmFileAPI.h
+++ b/Source/cmFileAPI.h
@@ -36,6 +36,9 @@ public:
and holding the original object. Other JSON types are unchanged. */
Json::Value MaybeJsonFile(Json::Value in, std::string const& prefix);
+ /** Report file-api capabilities for cmake -E capabilities. */
+ static Json::Value ReportCapabilities();
+
private:
cmake* CMakeInstance;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 0dca578..3772f09 100644
--- a/Source/cmake.cxx
+++ b/S
