mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'vs-ce-deploy'

Browse Source 
7035bdeb52 VS10Generator: add project properties to enable WindowsCE deployment.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3462
This commit is contained in:
Brad King
2019-06-24 12:25:32 +00:00
committed by Kitware Robot
parent a639464691 7035bdeb52
commit 1ba0cd2967
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -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(

17
Tests/RunCMake/VS10ProjectWinCE/VsCEDebuggerDeploy-check.cmake
View File

@@ -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.
#