From 0c5b96bf7ca781b9ff7bb00b79790215956d68e6 Mon Sep 17 00:00:00 2001 From: Simon Levermann Date: Mon, 23 Nov 2015 12:44:55 +0100 Subject: 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. --- Source/CPack/cmCPackDragNDropGenerator.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 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") -- cgit v0.12