[Cmake-commits] CMake branch, next, updated. v3.2.0-865-g096abec

[Nils Gladitz]

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  096abecb3fc9fac10514c7cb48a2c04056273520 (commit)
       via  e64f7e7fba6ab35343ef380f215e26d88ef0d01e (commit)
       via  8f38b8a4433b26da8f64b705fa82e520c40106d5 (commit)
       via  67a74c44541ed42b6898e98c87f4a9f625f9a458 (commit)
      from  09e6248ba23e6d89a98d03f4cb0831fb6ef55e3d (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=096abecb3fc9fac10514c7cb48a2c04056273520
commit 096abecb3fc9fac10514c7cb48a2c04056273520
Merge: 09e6248 e64f7e7
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Mar 6 08:20:16 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 6 08:20:16 2015 -0500

    Merge topic 'fix-wixobj-filenames' into next
    
    e64f7e7f CPackWIX: Preserve all but the last extension when generating .wixobj names.
    8f38b8a4 CMake Nightly Date Stamp
    67a74c44 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e64f7e7fba6ab35343ef380f215e26d88ef0d01e
commit e64f7e7fba6ab35343ef380f215e26d88ef0d01e
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Mar 6 14:19:30 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Mar 6 14:19:30 2015 +0100

    CPackWIX: Preserve all but the last extension when generating .wixobj names.

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 4b8daf8..d1d1d58 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -271,7 +271,8 @@ bool cmCPackWIXGenerator::PackageFilesImpl()
     std::string const& sourceFilename = this->WixSources[i];
 
     std::string objectFilename =
-      cmSystemTools::GetFilenameWithoutExtension(sourceFilename) + ".wixobj";
+      cmSystemTools::GetFilenameWithoutLastExtension(sourceFilename) +
+      ".wixobj";
 
     if(!RunCandleCommand(sourceFilename, objectFilename))
       {

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

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


hooks/post-receive
-- 
CMake