kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-VS-resources-pri-path' into release

This commit is contained in:
Brad King 2016-10-05 09:23:57 -04:00
parent fb2a399528 646d01da95
commit 1bc8a66d07
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -2736,8 +2736,10 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
(*this->BuildFileStream) << cmVS10EscapeXML(artifactDir) (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir)
<< "\\</AppxPackageArtifactsDir>\n"; << "\\</AppxPackageArtifactsDir>\n";
this->WriteString("<ProjectPriFullPath>", 2); this->WriteString("<ProjectPriFullPath>", 2);
(*this->BuildFileStream) << cmVS10EscapeXML(artifactDir) std::string resourcePriFile =
<< "\\resources.pri</ProjectPriFullPath>\n"; this->DefaultArtifactDir + "/resources.pri";
this->ConvertToWindowsSlash(resourcePriFile);
(*this->BuildFileStream) << resourcePriFile << "</ProjectPriFullPath>\n";
// If we are missing files and we don't have a certificate and // If we are missing files and we don't have a certificate and
// aren't targeting WP8.0, add a default certificate // aren't targeting WP8.0, add a default certificate