[Cmake-commits] CMake branch, master, updated. v3.11.1-663-g9b19d92
Kitware Robot
kwrobot at kitware.com
Mon Apr 30 09:25:06 EDT 2018
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 9b19d922c83e567dc3a9309821b8cb5f894c554e (commit)
via ddff7aebbc9009f1eaae708919cc7bfc30707b16 (commit)
via 27279fa2db6fc7cce88d15b50ed2e736b208bb72 (commit)
via 321442580e5a082ff52dba24237e89b355bc55b6 (commit)
via 2254b72061e08006e94c9a8ea3b9169f3f2cc1e6 (commit)
via 36d7f8ca106b69fbd02a361a156a31d2be7aae22 (commit)
via bea55a02d1a0a1800b8d5d5a9d2522272dd27ae9 (commit)
via 1f06c0d8a86f88b35d435798147ac1f422d87621 (commit)
via 1013560a6a7c34d7f268eacf12ffdb4874a70c8b (commit)
via d94754b2a77397f51411b4c97c2d1d1623e90b99 (commit)
via 83ed65cdde4bebc138d31ae80c39cfdbf42a12c2 (commit)
from 81aeb065e9e76cef22f39002bfff31ed4d826e74 (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=9b19d922c83e567dc3a9309821b8cb5f894c554e
commit 9b19d922c83e567dc3a9309821b8cb5f894c554e
Merge: ddff7aeb 3214425
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 30 09:22:22 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 30 09:22:22 2018 -0400
Merge branch 'release-3.11'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ddff7aebbc9009f1eaae708919cc7bfc30707b16
commit ddff7aebbc9009f1eaae708919cc7bfc30707b16
Merge: 27279fa 2254b72
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 30 13:20:48 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Apr 30 09:21:16 2018 -0400
Merge topic 'cxx-checks-tolerate-more-warnings'
2254b72061 C++ feature checks: Filter out warnings caused by local configuration
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2019
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27279fa2db6fc7cce88d15b50ed2e736b208bb72
commit 27279fa2db6fc7cce88d15b50ed2e736b208bb72
Merge: 36d7f8c 1013560
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 30 13:20:37 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Apr 30 09:20:42 2018 -0400
Merge topic 'java-new-packaging-version-sort'
1013560a6a FindJava, FindJNI: Ensure most recent version is searched first
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2016
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36d7f8ca106b69fbd02a361a156a31d2be7aae22
commit 36d7f8ca106b69fbd02a361a156a31d2be7aae22
Merge: bea55a0 83ed65c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 30 13:17:19 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Apr 30 09:18:02 2018 -0400
Merge topic 'vs-shader-generator-expressions'
83ed65cdde Add generator expressions for VS_SHADER_ source file properties.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2000
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bea55a02d1a0a1800b8d5d5a9d2522272dd27ae9
commit bea55a02d1a0a1800b8d5d5a9d2522272dd27ae9
Merge: 81aeb06 d94754b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 30 13:15:33 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Apr 30 09:15:43 2018 -0400
Merge topic 'doc_required_vs_component'
d94754b2a7 Help: Add hint to required VS 2017 component for C++/CLI support
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2015
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d94754b2a77397f51411b4c97c2d1d1623e90b99
commit d94754b2a77397f51411b4c97c2d1d1623e90b99
Author: Michael Stürmer <michael.stuermer at schaeffler.com>
AuthorDate: Fri Apr 27 07:49:06 2018 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 27 08:43:30 2018 -0400
Help: Add hint to required VS 2017 component for C++/CLI support
diff --git a/Help/prop_tgt/COMMON_LANGUAGE_RUNTIME.rst b/Help/prop_tgt/COMMON_LANGUAGE_RUNTIME.rst
index 28517e6..052ac6d 100644
--- a/Help/prop_tgt/COMMON_LANGUAGE_RUNTIME.rst
+++ b/Help/prop_tgt/COMMON_LANGUAGE_RUNTIME.rst
@@ -16,4 +16,7 @@ Supported values: ``""``, ``"pure"``, ``"safe"``
This property is only evaluated :ref:`Visual Studio Generators` for
VS 2010 and above.
+To be able to build managed C++ targets with VS 2017 and above the component
+``C++/CLI support`` must be installed, which may not be done by default.
+
See also :prop_tgt:`IMPORTED_COMMON_LANGUAGE_RUNTIME`
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83ed65cdde4bebc138d31ae80c39cfdbf42a12c2
commit 83ed65cdde4bebc138d31ae80c39cfdbf42a12c2
Author: Jeremiah van Oosten <jpvanoosten at hotmail.com>
AuthorDate: Tue Apr 24 11:25:13 2018 +0200
Commit: Jeremiah van Oosten <jpvanoosten at hotmail.com>
CommitDate: Thu Apr 26 23:00:10 2018 +0200
Add generator expressions for VS_SHADER_ source file properties.
diff --git a/Help/release/dev/vs-shader-generator-expressions.rst b/Help/release/dev/vs-shader-generator-expressions.rst
new file mode 100644
index 0000000..085be23
--- /dev/null
+++ b/Help/release/dev/vs-shader-generator-expressions.rst
@@ -0,0 +1,8 @@
+vs-shader-generator-expressions
+-------------------------------
+
+* Added support for generator expressions for the following source file
+ properties:
+
+ - :prop_sf:`VS_SHADER_DISABLE_OPTIMIZATIONS`
+ - :prop_sf:`VS_SHADER_ENABLE_DEBUG`
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 5c3b134..d766cb5 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1696,12 +1696,12 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
}
// Figure out if debug information should be generated
if (const char* sed = sf->GetProperty("VS_SHADER_ENABLE_DEBUG")) {
- shaderEnableDebug = cmSystemTools::IsOn(sed) ? "true" : "false";
+ shaderEnableDebug = sed;
toolHasSettings = true;
}
// Figure out if optimizations should be disabled
if (const char* sdo = sf->GetProperty("VS_SHADER_DISABLE_OPTIMIZATIONS")) {
- shaderDisableOptimizations = cmSystemTools::IsOn(sdo) ? "true" : "false";
+ shaderDisableOptimizations = sdo;
toolHasSettings = true;
}
if (const char* sofn = sf->GetProperty("VS_SHADER_OBJECT_FILE_NAME")) {
@@ -1843,12 +1843,39 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
}
}
if (!shaderEnableDebug.empty()) {
- this->WriteElemEscapeXML("EnableDebuggingInformation", shaderEnableDebug,
- 3);
+ cmGeneratorExpression ge;
+ std::unique_ptr<cmCompiledGeneratorExpression> cge =
+ ge.Parse(shaderEnableDebug);
+
+ for (size_t i = 0; i != this->Configurations.size(); ++i) {
+ const char* enableDebug =
+ cge->Evaluate(this->LocalGenerator, this->Configurations[i]);
+ if (strlen(enableDebug) > 0) {
+ Elem el(*this->BuildFileStream, 3);
+ el.StartElement("EnableDebuggingInformation");
+ el.Attribute("Condition", "'$(Configuration)|$(Platform)'=='" +
+ this->Configurations[i] + "|" + this->Platform + "'");
+ el.Content(cmSystemTools::IsOn(enableDebug) ? "true" : "false");
+ }
+ }
}
if (!shaderDisableOptimizations.empty()) {
- this->WriteElemEscapeXML("DisableOptimizations",
- shaderDisableOptimizations, 3);
+ cmGeneratorExpression ge;
+ std::unique_ptr<cmCompiledGeneratorExpression> cge =
+ ge.Parse(shaderDisableOptimizations);
+
+ for (size_t i = 0; i != this->Configurations.size(); ++i) {
+ const char* disableOptimizations =
+ cge->Evaluate(this->LocalGenerator, this->Configurations[i]);
+ if (strlen(disableOptimizations) > 0) {
+ Elem el(*this->BuildFileStream, 3);
+ el.StartElement("DisableOptimizations");
+ el.Attribute("Condition", "'$(Configuration)|$(Platform)'=='" +
+ this->Configurations[i] + "|" + this->Platform + "'");
+ el.Content(cmSystemTools::IsOn(disableOptimizations) ? "true"
+ : "false");
+ }
+ }
}
if (!shaderObjectFileName.empty()) {
this->WriteElemEscapeXML("ObjectFileOutput", shaderObjectFileName, 3);
-----------------------------------------------------------------------
Summary of changes:
Help/prop_tgt/COMMON_LANGUAGE_RUNTIME.rst | 3 ++
.../dev/vs-shader-generator-expressions.rst | 8 ++++
Modules/FindJNI.cmake | 18 +++++++--
Modules/FindJava.cmake | 20 ++++++++--
Source/Checks/cm_cxx_features.cmake | 3 ++
Source/cmVisualStudio10TargetGenerator.cxx | 39 +++++++++++++++++---
6 files changed, 78 insertions(+), 13 deletions(-)
create mode 100644 Help/release/dev/vs-shader-generator-expressions.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list