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 d9cf0ec4d4a942aec3360d66855379f7360ab00d (commit)
via 95387dbf6070bf1da9e69ee92b7104130ef290df (commit)
via 905b7759adaaa6deca51186faa19beec2790e24e (commit)
via 2a2c890023c7cfc643d8390a07bffe7676556b32 (commit)
via 84408ff4025b59f268e07bc368e97fe07252be2c (commit)
via 51c69fe5f88ea8ed262665b953f1202668ba9cf8 (commit)
from 0fff8d653c38e20d9b7a4c026b66f45f8078cb41 (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=d9cf0ec4d4a942aec3360d66855379f7360ab00d
commit d9cf0ec4d4a942aec3360d66855379f7360ab00d
Merge: 95387dbf60 51c69fe5f8
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Nov 21 16:01:52 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Nov 21 11:02:00 2019 -0500
Merge topic 'fileapi-multi-config'
51c69fe5f8 FileAPI: Add "multiConfig" parameter to index file
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Brad King <brad.k...@kitware.com>
Merge-request: !4072
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95387dbf6070bf1da9e69ee92b7104130ef290df
commit 95387dbf6070bf1da9e69ee92b7104130ef290df
Merge: 905b7759ad 2a2c890023
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Nov 21 16:00:25 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Nov 21 11:00:34 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=905b7759adaaa6deca51186faa19beec2790e24e
commit 905b7759adaaa6deca51186faa19beec2790e24e
Merge: 0fff8d653c 84408ff402
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Nov 21 16:00:25 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Nov 21 11:00:33 2019 -0500
Merge topic 'FindwxWidgets-qt-debug'
84408ff402 FindwxWidgets: Find wxQt debug libraries
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4069
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51c69fe5f88ea8ed262665b953f1202668ba9cf8
commit 51c69fe5f88ea8ed262665b953f1202668ba9cf8
Author: Kyle Edwards <kyle.edwa...@kitware.com>
AuthorDate: Wed Nov 20 09:44:28 2019 -0500
Commit: Kyle Edwards <kyle.edwa...@kitware.com>
CommitDate: Wed Nov 20 09:46:10 2019 -0500
FileAPI: Add "multiConfig" parameter to index file
diff --git a/Help/manual/cmake-file-api.7.rst b/Help/manual/cmake-file-api.7.rst
index 04b6ed2598..12eecd9932 100644
--- a/Help/manual/cmake-file-api.7.rst
+++ b/Help/manual/cmake-file-api.7.rst
@@ -199,6 +199,7 @@ The reply index file contains a JSON object:
"root": "/prefix/share/cmake-3.14"
},
"generator": {
+ "multiConfig": false,
"name": "Unix Makefiles"
}
},
@@ -267,6 +268,9 @@ The members are:
A JSON object describing the CMake generator used for the build.
It has members:
+ ``multiConfig``
+ A boolean specifying whether the generator supports multiple output
+ configurations.
``name``
A string specifying the name of the generator.
``platform``
diff --git a/Help/release/dev/fileapi-multi-config.rst
b/Help/release/dev/fileapi-multi-config.rst
new file mode 100644
index 0000000000..e0e2e16a52
--- /dev/null
+++ b/Help/release/dev/fileapi-multi-config.rst
@@ -0,0 +1,6 @@
+fileapi-multi-config
+--------------------
+
+* The :manual:`file API <cmake-file-api(7)>` index file now emits a
+ ``multiConfig`` flag specifying whether or not the generator supports
+ multiple output configurations.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d903289e4b..e38066fc8d 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -124,6 +124,7 @@ Json::Value cmGlobalGenerator::GetJson() const
{
Json::Value generator = Json::objectValue;
generator["name"] = this->GetName();
+ generator["multiConfig"] = this->IsMultiConfig();
return generator;
}
#endif
diff --git a/Tests/RunCMake/FileAPI/check_index.py
b/Tests/RunCMake/FileAPI/check_index.py
index cda72341cb..23b02e908a 100644
--- a/Tests/RunCMake/FileAPI/check_index.py
+++ b/Tests/RunCMake/FileAPI/check_index.py
@@ -109,10 +109,11 @@ def check_cmake_generator(g):
name = g.get("name", None)
assert is_string(name)
if name.startswith("Visual Studio"):
- assert sorted(g.keys()) == ["name", "platform"]
+ assert sorted(g.keys()) == ["multiConfig", "name", "platform"]
assert is_string(g["platform"])
else:
- assert sorted(g.keys()) == ["name"]
+ assert sorted(g.keys()) == ["multiConfig", "name"]
+ assert is_bool(g["multiConfig"], matches(name, "^(Visual Studio |Xcode$)"))
def check_index_object(indexEntry, kind, major, minor, check):
assert is_dict(indexEntry)
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-file-api.7.rst | 4 ++++
Help/release/dev/fileapi-multi-config.rst | 6 ++++++
Modules/FindwxWidgets.cmake | 2 ++
Source/cmGlobalGenerator.cxx | 1 +
Tests/RunCMake/FileAPI/check_index.py | 5 +++--
5 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 Help/release/dev/fileapi-multi-config.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
