Commit 1ba0cd29 authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'vs-ce-deploy'

7035bdeb VS10Generator: add project properties to enable WindowsCE deployment.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !3462
parents a6394646 7035bdeb
Pipeline #139807 passed with stage
in 0 seconds
......@@ -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(
......
......@@ -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.
#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment