diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-06 14:08:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-06 14:08:04 (GMT) |
| commit | 1aaace3e54e5da05b68f246899e125e4ba1ce29e (patch) | |
| tree | 33113e9165694abf7a1a6355e29abdf7ad4fd172 | |
| parent | b12affd78578247678ca25e1b9711625c6c60268 (diff) | |
| parent | 646d01da9536d2db912a80f7d45ba289d8c89295 (diff) | |
| download | CMake-1aaace3e54e5da05b68f246899e125e4ba1ce29e.zip CMake-1aaace3e54e5da05b68f246899e125e4ba1ce29e.tar.gz CMake-1aaace3e54e5da05b68f246899e125e4ba1ce29e.tar.bz2 | |
Merge topic 'fix-VS-resources-pri-path'
646d01da VS: Use absolute target-specific directory for `resources.pri`
| -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 |