[Cmake-commits] CMake branch, next, updated. v3.6.1-1421-gbf1c52e

[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  bf1c52ecfbd2d5abd1ca6e761c284aa9fdd3cc48 (commit)
       via  9e0ce22cee97be5f6aa2a62f5b46284d3c4b1148 (commit)
      from  96199676e0d3a8d14480b781b5e0534b2d342006 (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=bf1c52ecfbd2d5abd1ca6e761c284aa9fdd3cc48
commit bf1c52ecfbd2d5abd1ca6e761c284aa9fdd3cc48
Merge: 9619967 9e0ce22
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 25 09:13:38 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 25 09:13:38 2016 -0400

    Merge topic 'vs-resource-pri-dir' into next
    
    9e0ce22c Revert "VS: Use target-specific intermediate directory for `resources.pri`"


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

    Revert "VS: Use target-specific intermediate directory for `resources.pri`"
    
    This reverts commit d8fbb7d2d33ddbfa69f13e86c9da293591bf8d5f.
    It causes the Store/Phone tests to fail.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index ffad095..c33a291 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>"
-                        "$(IntDir)resources.pri</ProjectPriFullPath>\n",
+                        "$(TargetDir)resources.pri</ProjectPriFullPath>\n",
                         2);
 
       // If we are missing files and we don't have a certificate and

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake