[Cmake-commits] CMake branch, next, updated. v3.4.0-1465-g804de5d

[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  804de5d0269ee1f8220bccaa743f447c75252d80 (commit)
       via  03c85501c6bfeac86f8fcdeb066722949a5b9096 (commit)
      from  881bf217627b0c5b7fbf18bbe2f3282cfc832209 (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=804de5d0269ee1f8220bccaa743f447c75252d80
commit 804de5d0269ee1f8220bccaa743f447c75252d80
Merge: 881bf21 03c8550
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 23 10:12:08 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 23 10:12:08 2015 -0500

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03c85501c6bfeac86f8fcdeb066722949a5b9096
commit 03c85501c6bfeac86f8fcdeb066722949a5b9096
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:10:12 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..4ef102d 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"),
+    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:
 Source/CPack/cmCPackDragNDropGenerator.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake