[Cmake-commits] CMake branch, next, updated. v2.8.12-4471-g6046b46

[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  6046b468a353f124b32898f03ac5cf0a9790ffe1 (commit)
       via  a6ba28b1ea20d2dacb51e008aec562776850b356 (commit)
      from  5e249f80dcd2e66d62293c8d6aa792d13bf85227 (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=6046b468a353f124b32898f03ac5cf0a9790ffe1
commit 6046b468a353f124b32898f03ac5cf0a9790ffe1
Merge: 5e249f8 a6ba28b
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Oct 24 12:24:11 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 24 12:24:11 2013 -0400

    Merge topic 'wix-fix-shortcut-ids' into next
    
    a6ba28b CPackWiX: fixed ambiguities and incorrect increment


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6ba28b1ea20d2dacb51e008aec562776850b356
commit a6ba28b1ea20d2dacb51e008aec562776850b356
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Oct 24 18:21:51 2013 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Thu Oct 24 18:21:51 2013 +0200

    CPackWiX: fixed ambiguities and incorrect increment

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 3c11528..448d8d1 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -666,10 +666,10 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons(
       featureDefinitions.AddAttribute("Id", componentId);
       featureDefinitions.EndElement("ComponentRef");
 
-      for(size_t i = 0; i < packageExecutables.size(); ++i)
+      for(size_t j = 0; j < packageExecutables.size(); ++j)
         {
-        std::string const& executableName = packageExecutables[i++];
-        std::string const& textLabel = packageExecutables[i++];
+        std::string const& executableName = packageExecutables[j++];
+        std::string const& textLabel = packageExecutables[j];
 
         if(cmSystemTools::LowerCase(fileName) ==
             cmSystemTools::LowerCase(executableName) + ".exe")
diff --git a/Source/CPack/WiX/cmWIXSourceWriter.cxx b/Source/CPack/WiX/cmWIXSourceWriter.cxx
index a84f42d..214b8ac 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXSourceWriter.cxx
@@ -22,7 +22,7 @@ cmWIXSourceWriter::cmWIXSourceWriter(cmCPackLog* logger,
     Logger(logger),
     file(filename.c_str()),
     state(DEFAULT),
-    filename(filename)
+    sourceFilename(filename)
 {
   WriteXMLDeclaration();
 
@@ -44,7 +44,7 @@ cmWIXSourceWriter::~cmWIXSourceWriter()
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR,
       elements.size() - 1 << " WiX elements were still open when closing '" <<
-      filename << "'" << std::endl);
+      sourceFilename << "'" << std::endl);
     return;
     }
 
@@ -72,7 +72,7 @@ void cmWIXSourceWriter::EndElement(std::string const& name)
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR,
       "can not end WiX element with no open elements in '" <<
-      filename << "'" << std::endl);
+      sourceFilename << "'" << std::endl);
     return;
     }
 
@@ -81,7 +81,7 @@ void cmWIXSourceWriter::EndElement(std::string const& name)
     cmCPackLogger(cmCPackLog::LOG_ERROR,
       "WiX element <" << elements.back() <<
       "> can not be closed by </" << name << "> in '" <<
-      filename << "'" << std::endl);
+      sourceFilename << "'" << std::endl);
     return;
     }
 
diff --git a/Source/CPack/WiX/cmWIXSourceWriter.h b/Source/CPack/WiX/cmWIXSourceWriter.h
index eac83c6..0c7803c 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXSourceWriter.h
@@ -63,7 +63,7 @@ private:
 
   std::vector<std::string> elements;
 
-  std::string filename;
+  std::string sourceFilename;
 };
 
 #endif
diff --git a/Tests/CPackWiXGenerator/CMakeLists.txt b/Tests/CPackWiXGenerator/CMakeLists.txt
index c22909e..b54925a 100644
--- a/Tests/CPackWiXGenerator/CMakeLists.txt
+++ b/Tests/CPackWiXGenerator/CMakeLists.txt
@@ -7,12 +7,14 @@ add_library(mylib mylib.cpp)
 add_executable(my-libapp mylibapp.cpp)
 target_link_libraries(my-libapp mylib)
 
+add_executable(my-other-app myotherapp.cpp)
+
 install(TARGETS mylib
   ARCHIVE
   DESTINATION lib
   COMPONENT libraries)
 
-install(TARGETS my-libapp
+install(TARGETS my-libapp my-other-app
   RUNTIME
   DESTINATION bin
   COMPONENT applications)
@@ -36,7 +38,11 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "CPack Component Example")
 
 set(CPACK_WIX_UPGRADE_GUID "BF20CE5E-7F7C-401D-8F7C-AB45E8D170E6")
 set(CPACK_WIX_UNINSTALL "1")
-set(CPACK_PACKAGE_EXECUTABLES "my-libapp; CPack Wix Test")
+
+set(CPACK_PACKAGE_EXECUTABLES
+  "my-libapp" "CPack WiX Test"
+  "my-other-app" "Second CPack WiX Test"
+)
 
 include(CPack)
 
diff --git a/Tests/CPackWiXGenerator/myotherapp.cpp b/Tests/CPackWiXGenerator/myotherapp.cpp
new file mode 100644
index 0000000..c272dab
--- /dev/null
+++ b/Tests/CPackWiXGenerator/myotherapp.cpp
@@ -0,0 +1 @@
+int main() {}
\ No newline at end of file

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

Summary of changes:
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |    6 +++---
 Source/CPack/WiX/cmWIXSourceWriter.cxx   |    8 ++++----
 Source/CPack/WiX/cmWIXSourceWriter.h     |    2 +-
 Tests/CPackWiXGenerator/CMakeLists.txt   |   10 ++++++++--
 Tests/CPackWiXGenerator/myotherapp.cpp   |    1 +
 5 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 Tests/CPackWiXGenerator/myotherapp.cpp


hooks/post-receive
-- 
CMake