From f325ae186d5d235cb90f4fb002a8df56abc050f8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 25 Aug 2016 09:17:17 -0400 Subject: [PATCH] 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 --- Source/cmVisualStudio10TargetGenerator.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index c33a2917e..1b1d04b18 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2741,9 +2741,9 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile() this->WriteString("", 2); (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir) << "\\\n"; - this->WriteString("" - "$(TargetDir)resources.pri\n", - 2); + this->WriteString("", 2); + (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir) + << "\\resources.pri\n"; // If we are missing files and we don't have a certificate and // aren't targeting WP8.0, add a default certificate