[Cmake-commits] CMake branch, next, updated. v3.4.0-1471-g5d24c39

[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  5d24c399b564cb73442e33471fdbcd2e1a390bc6 (commit)
       via  0c5b96bf7ca781b9ff7bb00b79790215956d68e6 (commit)
      from  0f92b26643bf519218f7ea7107eb2cf617e48056 (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=5d24c399b564cb73442e33471fdbcd2e1a390bc6
commit 5d24c399b564cb73442e33471fdbcd2e1a390bc6
Merge: 0f92b26 0c5b96b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 23 10:23:11 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 23 10:23:11 2015 -0500

    Merge topic 'cpack-dmg-multilanguage-sla' into next
    
    0c5b96bf CPack/DragNDrop: Use documented CPACK_DMG_SLA_LANGUAGES variable


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c5b96bf7ca781b9ff7bb00b79790215956d68e6
commit 0c5b96bf7ca781b9ff7bb00b79790215956d68e6
Author:     Simon Levermann <simon-github at slevermann.de>
AuthorDate: Mon Nov 23 12:44:55 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 23 10:22:15 2015 -0500

    CPack/DragNDrop: Use documented CPACK_DMG_SLA_LANGUAGES variable
    
    The change in commit f88533cc (CPackDMG: Add support for multilingual
    SLAs, 2015-10-19) accidentally used CPACK_DMG_LANGUAGES in its
    implementation instead of the intended CPACK_DMG_SLA_LANGUAGES added to
    the documentation.

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 7a93fc6..b5df2d0 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -137,11 +137,11 @@ int cmCPackDragNDropGenerator::InitializeInternal()
           << std::endl);
         }
       }
-    if(!this->IsSet("CPACK_DMG_LANGUAGES"))
+    if(!this->IsSet("CPACK_DMG_SLA_LANGUAGES"))
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR,
         "CPACK_DMG_SLA_DIR set but no languages defined "
-        "(set CPACK_DMG_LANGUAGES)"
+        "(set CPACK_DMG_SLA_LANGUAGES)"
         << std::endl);
       return 0;
       }
@@ -154,12 +154,12 @@ int cmCPackDragNDropGenerator::InitializeInternal()
       }
 
     std::vector<std::string> languages;
-    cmSystemTools::ExpandListArgument(this->GetOption("CPACK_DMG_LANGUAGES"),
-                                      languages);
+    cmSystemTools::ExpandListArgument(
+      this->GetOption("CPACK_DMG_SLA_LANGUAGES"), languages);
     if(languages.empty())
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR,
-        "CPACK_DMG_LANGUAGES set but empty"
+        "CPACK_DMG_SLA_LANGUAGES set but empty"
         << std::endl);
       return 0;
       }
@@ -350,8 +350,8 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
     ? this->GetOption("CPACK_DMG_DS_STORE") : "";
 
   const std::string cpack_dmg_languages =
-    this->GetOption("CPACK_DMG_LANGUAGES")
-      ? this->GetOption("CPACK_DMG_LANGUAGES") : "";
+    this->GetOption("CPACK_DMG_SLA_LANGUAGES")
+      ? this->GetOption("CPACK_DMG_SLA_LANGUAGES") : "";
 
   const std::string cpack_dmg_ds_store_setup_script =
     this->GetOption("CPACK_DMG_DS_STORE_SETUP_SCRIPT")

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

Summary of changes:


hooks/post-receive
-- 
CMake