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

Merge topic 'cpack-dmg-multilanguage-sla'

Browse Source 
0c5b96bf CPack/DragNDrop: Use documented CPACK_DMG_SLA_LANGUAGES variable
This commit is contained in:
Brad King 2015-11-24 09:26:34 -05:00 committed by CMake Topic Stage
commit 7c74de8de8
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")