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 e8fe1d34f822fe0d7bb6e289e04e266671b28d38 (commit)
via 2225c8a1dd762b561b2fba07e0215b71390a31b1 (commit)
via 1ba0cd29677ad077a646f55d705c8f45433cd21d (commit)
via 7dbd21fcf4a48917486a3f02fa9d70037fe0e854 (commit)
via 96c6bc25845c31da4031f667b583baf6f121a1c2 (commit)
via 7035bdeb523a304e619bf53b3c491287c45521e9 (commit)
from a63946469130818992d23632b6e821127d641bd5 (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=e8fe1d34f822fe0d7bb6e289e04e266671b28d38
commit e8fe1d34f822fe0d7bb6e289e04e266671b28d38
Merge: 2225c8a 7dbd21f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 24 08:28:13 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jun 24 08:28:13 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2225c8a1dd762b561b2fba07e0215b71390a31b1
commit 2225c8a1dd762b561b2fba07e0215b71390a31b1
Merge: 1ba0cd2 96c6bc2
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 24 12:26:19 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Jun 24 08:26:46 2019 -0400
Merge topic 'doc-IMPORTED_LOCATION'
96c6bc2584 Help: Improve documentation of IMPORTED_LOCATION property
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Alex Turbov <i.za...@gmail.com>
Merge-request: !3466
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ba0cd29677ad077a646f55d705c8f45433cd21d
commit 1ba0cd29677ad077a646f55d705c8f45433cd21d
Merge: a639464 7035bde
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 24 12:25:32 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Jun 24 08:25:41 2019 -0400
Merge topic 'vs-ce-deploy'
7035bdeb52 VS10Generator: add project properties to enable WindowsCE
deployment.
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3462
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7035bdeb523a304e619bf53b3c491287c45521e9
commit 7035bdeb523a304e619bf53b3c491287c45521e9
Author: Wil Stark <wil_st...@keysight.com>
AuthorDate: Wed Jun 19 15:11:57 2019 -0700
Commit: Wil Stark <wil_st...@keysight.com>
CommitDate: Wed Jun 19 15:11:57 2019 -0700
VS10Generator: add project properties to enable WindowsCE deployment.
Fixes: #19408
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 634c990..8b9a41f 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -505,6 +505,11 @@ void cmVisualStudio10TargetGenerator::Generate()
if (targetFrameworkVersion) {
e1.Element("TargetFrameworkVersion", targetFrameworkVersion);
}
+ if (this->ProjectType == vcxproj &&
+ this->GlobalGenerator->TargetsWindowsCE()) {
+ e1.Element("EnableRedirectPlatform", "true");
+ e1.Element("RedirectPlatformValue", this->Platform);
+ }
if (this->ProjectType == csproj &&
this->GlobalGenerator->TargetsWindowsCE()) {
const char* targetFrameworkId = this->GeneratorTarget->GetProperty(
diff --git a/Tests/RunCMake/VS10ProjectWinCE/VsCEDebuggerDeploy-check.cmake
b/Tests/RunCMake/VS10ProjectWinCE/VsCEDebuggerDeploy-check.cmake
index dab1c33..b1deb99 100644
--- a/Tests/RunCMake/VS10ProjectWinCE/VsCEDebuggerDeploy-check.cmake
+++ b/Tests/RunCMake/VS10ProjectWinCE/VsCEDebuggerDeploy-check.cmake
@@ -14,6 +14,9 @@ endif()
set(FoundCEAdditionalFiles FALSE)
set(FoundRemoteDirectory FALSE)
set(FoundToolsVersion4 FALSE)
+set(FoundEnableRedirectPlatform FALSE)
+set(FoundRedirectPlatformValue FALSE)
+
file(STRINGS "${vcProjectFile}" lines)
foreach(line IN LISTS lines)
@@ -23,6 +26,10 @@ foreach(line IN LISTS lines)
set(FoundRemoteDirectory TRUE)
elseif(line MATCHES " *<Project +.*ToolsVersion=\"4.0\".*> *$")
set(FoundToolsVersion4 TRUE)
+ elseif(line MATCHES "^
*<EnableRedirectPlatform>true</EnableRedirectPlatform> *$")
+ set(FoundEnableRedirectPlatform TRUE)
+ elseif(line MATCHES "^ *<RedirectPlatformValue>.+</RedirectPlatformValue>
*$")
+ set(FoundRedirectPlatformValue TRUE)
endif()
endforeach()
@@ -41,6 +48,16 @@ if(NOT FoundToolsVersion4)
return()
endif()
+if(NOT FoundEnableRedirectPlatform)
+ set(RunCMake_TEST_FAILED "Failed to find EnableRedirectPlatform true
property.")
+ return()
+endif()
+
+if(NOT FoundRedirectPlatformValue)
+ set(RunCMake_TEST_FAILED "Failed to find RedirectPlatformValue property.")
+ return()
+endif()
+
#
# Test solution file deployment items.
#
-----------------------------------------------------------------------
Summary of changes:
Help/prop_tgt/IMPORTED_LOCATION.rst | 15 +++++++++++----
Source/cmVisualStudio10TargetGenerator.cxx | 5 +++++
.../VS10ProjectWinCE/VsCEDebuggerDeploy-check.cmake | 17 +++++++++++++++++
3 files changed, 33 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
