[Cmake-commits] CMake branch, next, updated. v3.6.1-1441-gd708b54

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d708b54d0dc44340c71b7288a719f846c4b27a39 (commit)
       via  f325ae186d5d235cb90f4fb002a8df56abc050f8 (commit)
      from  826dd1ed9908ac29fb375b7af232e7a13eaa647a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d708b54d0dc44340c71b7288a719f846c4b27a39
commit d708b54d0dc44340c71b7288a719f846c4b27a39
Merge: 826dd1e f325ae1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 25 10:13:00 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 25 10:13:00 2016 -0400

    Merge topic 'vs-resource-pri-dir' into next
    
    f325ae18 VS: Use target-specific directory for `resources.pri`


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f325ae186d5d235cb90f4fb002a8df56abc050f8
commit f325ae186d5d235cb90f4fb002a8df56abc050f8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 25 09:17:17 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 25 09:17:17 2016 -0400

    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

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

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake