[Cmake-commits] CMake branch, next, updated. v3.6.1-1379-gab1846f

[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  ab1846f43b8eff95eba073a9df2414f24601d7a5 (commit)
       via  d8fbb7d2d33ddbfa69f13e86c9da293591bf8d5f (commit)
       via  00a583ac6833bdb2909d1bab1bffb28fb6c2b245 (commit)
      from  43edf727670912226bfbb7d9b4579e28013b42be (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=ab1846f43b8eff95eba073a9df2414f24601d7a5
commit ab1846f43b8eff95eba073a9df2414f24601d7a5
Merge: 43edf72 d8fbb7d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 24 09:32:35 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 24 09:32:35 2016 -0400

    Merge topic 'vs-resource-pri-dir' into next
    
    d8fbb7d2 VS: Use target-specific intermediate directory for `resources.pri`
    00a583ac CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8fbb7d2d33ddbfa69f13e86c9da293591bf8d5f
commit d8fbb7d2d33ddbfa69f13e86c9da293591bf8d5f
Author:     Vitalyi Khoruzhyi <vital.pk at gmail.com>
AuthorDate: Fri May 20 14:18:02 2016 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 24 09:02:49 2016 -0400

    VS: Use target-specific intermediate 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..ffad095 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2742,7 +2742,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
       (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir)
                                << "\\</AppxPackageArtifactsDir>\n";
       this->WriteString("<ProjectPriFullPath>"
-                        "$(TargetDir)resources.pri</ProjectPriFullPath>\n",
+                        "$(IntDir)resources.pri</ProjectPriFullPath>\n",
                         2);
 
       // If we are missing files and we don't have a certificate and

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

Summary of changes:
 Source/CMakeVersion.cmake                  |    2 +-
 Source/cmVisualStudio10TargetGenerator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake