diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-25 13:17:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-25 13:17:17 (GMT) |
| commit | f325ae186d5d235cb90f4fb002a8df56abc050f8 (patch) | |
| tree | a3f4719e9c07705c8e49646f2eb99f13d083da43 | |
| parent | 00a583ac6833bdb2909d1bab1bffb28fb6c2b245 (diff) | |
| download | CMake-f325ae186d5d235cb90f4fb002a8df56abc050f8.zip CMake-f325ae186d5d235cb90f4fb002a8df56abc050f8.tar.gz CMake-f325ae186d5d235cb90f4fb002a8df56abc050f8.tar.bz2 | |
VS: Use target-specific directory for `resources.pri`
Set the `ProjectPriFullPath` field to a value that is unique to each
target and not shared with others in order to avoid collisions.
Closes: #16106
| -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 |