[cmake-developers] [CPackDMG][PATCH] Use documented variable names in code

[Levermann, Simon]

Hi,

in my previous patch to add multiple language support for SLAs in the
CPackDMG module, the documentation I added talks about using the
variable "CPACK_DMG_SLA_LANGUAGES", but the code itself uses
"CPACK_DMG_LANGUAGES". This patch fixes that discrepancy and uses the
documented variable "CPACK_DMG_SLA_LANGUAGES" instead.

Kind regards
Simon Levermann
From 949e0eb5dffda94f275d863699df3c616584dfc9 Mon Sep 17 00:00:00 2001
From: Simon Levermann <simon-git...@slevermann.de>
Date: Mon, 23 Nov 2015 12:44:55 +0100
Subject: [PATCH] Use variable name in code that is used in documentation

---
 Source/CPack/cmCPackDragNDropGenerator.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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")
-- 
2.5.0


-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers