diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-26 13:45:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-26 13:45:28 (GMT) |
| commit | da7111e1a34bd8b85a98ed1ebc14f65c499748be (patch) | |
| tree | 1c2f3bcf41faa3c9645f86e78bd49957e28ad000 | |
| parent | ff88df48e8a693f213a44aee3ad2474f500857b5 (diff) | |
| parent | f325ae186d5d235cb90f4fb002a8df56abc050f8 (diff) | |
| download | CMake-da7111e1a34bd8b85a98ed1ebc14f65c499748be.zip CMake-da7111e1a34bd8b85a98ed1ebc14f65c499748be.tar.gz CMake-da7111e1a34bd8b85a98ed1ebc14f65c499748be.tar.bz2 | |
Merge topic 'vs-resource-pri-dir'
f325ae18 VS: Use target-specific directory for `resources.pri`
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index c33a291..1b1d04b 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2741,9 +2741,9 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile() this->WriteString("<AppxPackageArtifactsDir>", 2); (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir) << "\\</AppxPackageArtifactsDir>\n"; - this->WriteString("<ProjectPriFullPath>" - "$(TargetDir)resources.pri</ProjectPriFullPath>\n", - 2); + this->WriteString("<ProjectPriFullPath>", 2); + (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir) + << "\\resources.pri</ProjectPriFullPath>\n"; // If we are missing files and we don't have a certificate and // aren't targeting WP8.0, add a default certificate |