[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-69-gca4f693

[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  ca4f6938620160242f24f612a5495d40bf5cf933 (commit)
       via  646d01da9536d2db912a80f7d45ba289d8c89295 (commit)
      from  280cf7aa4e2cad24440039f4b7105c5096caf437 (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=ca4f6938620160242f24f612a5495d40bf5cf933
commit ca4f6938620160242f24f612a5495d40bf5cf933
Merge: 280cf7a 646d01d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 5 09:25:16 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 5 09:25:16 2016 -0400

    Merge topic 'fix-VS-resources-pri-path' into next
    
    646d01da VS: Use absolute target-specific directory for `resources.pri`


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=646d01da9536d2db912a80f7d45ba289d8c89295
commit 646d01da9536d2db912a80f7d45ba289d8c89295
Author:     Roman Wüger <office at wueger.at>
AuthorDate: Tue Oct 4 23:02:28 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 5 09:21:58 2016 -0400

    VS: Use absolute target-specific directory for `resources.pri`
    
    The change in commit v3.7.0-rc1~219^2 (VS: Use target-specific directory
    for `resources.pri`, 2016-08-25) incorrectly specifies a relative path
    for the `ProjectPriFullPath` value.  Fix it to use an absolute path.
    
    Issue: #16106

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index d81f59d..6690bfa 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2736,8 +2736,10 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
       (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir)
                                << "\\</AppxPackageArtifactsDir>\n";
       this->WriteString("<ProjectPriFullPath>", 2);
-      (*this->BuildFileStream) << cmVS10EscapeXML(artifactDir)
-                               << "\\resources.pri</ProjectPriFullPath>\n";
+      std::string resourcePriFile =
+        this->DefaultArtifactDir + "/resources.pri";
+      this->ConvertToWindowsSlash(resourcePriFile);
+      (*this->BuildFileStream) << resourcePriFile << "</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, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake