diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-24 14:26:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-11-24 14:26:34 (GMT) |
| commit | 7c74de8de8be5a03a572f476bedc9d4c5ca6c0a0 (patch) | |
| tree | 44e1c6fff41535432a2158bb2589fdae908d31ed /Source | |
| parent | b2de70a036cb3e1ae677b0a923c05276af4e6054 (diff) | |
| parent | 0c5b96bf7ca781b9ff7bb00b79790215956d68e6 (diff) | |
| download | CMake-7c74de8de8be5a03a572f476bedc9d4c5ca6c0a0.zip CMake-7c74de8de8be5a03a572f476bedc9d4c5ca6c0a0.tar.gz CMake-7c74de8de8be5a03a572f476bedc9d4c5ca6c0a0.tar.bz2 | |
Merge topic 'cpack-dmg-multilanguage-sla'
0c5b96bf CPack/DragNDrop: Use documented CPACK_DMG_SLA_LANGUAGES variable
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cmCPackDragNDropGenerator.cxx | 14 |
1 files 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<std::string> 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") |