diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-05 13:23:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-05 13:23:57 (GMT) |
| commit | 1bc8a66d07aed8d5636bcfd74a8d143694bfa2aa (patch) | |
| tree | 2a7bb56248799332b7be0dfdac42ea08f835b450 /Source | |
| parent | fb2a39952883a6690855ceac3cc19e3cae59f8dd (diff) | |
| parent | 646d01da9536d2db912a80f7d45ba289d8c89295 (diff) | |
| download | CMake-1bc8a66d07aed8d5636bcfd74a8d143694bfa2aa.zip CMake-1bc8a66d07aed8d5636bcfd74a8d143694bfa2aa.tar.gz CMake-1bc8a66d07aed8d5636bcfd74a8d143694bfa2aa.tar.bz2 | |
Merge branch 'fix-VS-resources-pri-path' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index d81f59d..6690bfa 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2736,8 +2736,10 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile() (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir) << "\\</AppxPackageArtifactsDir>\n"; this->WriteString("<ProjectPriFullPath>", 2); - (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir) - << "\\resources.pri</ProjectPriFullPath>\n"; + std::string resourcePriFile = + 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 // aren't targeting WP8.0, add a default certificate |