kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Simon Levermann 2015-11-23 12:44:55 +01:00 committed by Brad King
parent dbef2244f9
commit 0c5b96bf7c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/CPack/cmCPackDragNDropGenerator.cxx
View File

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