[Cmake-commits] CMake branch, next, updated. v3.4.0-1469-g0f92b26

Brad King brad.king at kitware.com
Mon Nov 23 10:22:58 EST 2015


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  0f92b26643bf519218f7ea7107eb2cf617e48056 (commit)
       via  3c80335160f44d7faee118d15b0f670cd1ff6ca6 (commit)
      from  55d32996139459115e92666cf0d54dffc037b754 (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=0f92b26643bf519218f7ea7107eb2cf617e48056
commit 0f92b26643bf519218f7ea7107eb2cf617e48056
Merge: 55d3299 3c80335
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 23 10:22:57 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 23 10:22:57 2015 -0500

    Merge topic 'cpack-dmg-multilanguage-sla' into next
    
    3c803351 fixup! CPack/DragNDrop: Use documented CPACK_DMG_SLA_LANGUAGES variable


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c80335160f44d7faee118d15b0f670cd1ff6ca6
commit 3c80335160f44d7faee118d15b0f670cd1ff6ca6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 23 10:22:34 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 23 10:22:34 2015 -0500

    fixup! CPack/DragNDrop: Use documented CPACK_DMG_SLA_LANGUAGES variable

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 4ef102d..b5df2d0 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -154,8 +154,8 @@ int cmCPackDragNDropGenerator::InitializeInternal()
       }
 
     std::vector<std::string> languages;
-    cmSystemTools::ExpandListArgument(this->GetOption("CPACK_DMG_SLA_LANGUAGES"),
-                                      languages);
+    cmSystemTools::ExpandListArgument(
+      this->GetOption("CPACK_DMG_SLA_LANGUAGES"), languages);
     if(languages.empty())
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR,

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

Summary of changes:
 Source/CPack/cmCPackDragNDropGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list