diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-03-12 10:52:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-12 10:52:11 (GMT) |
| commit | 54863e28ce8efe9d1827c4d69a2bd0e5b213544f (patch) | |
| tree | 94639551f82c28c3af5b726a151c3bb04159aaaf /Source | |
| parent | 662d17e9102d702a3e4f27f20d23981652c30de4 (diff) | |
| parent | 14732d3f3013479440af0e702b3c82c490365a64 (diff) | |
| download | CMake-54863e28ce8efe9d1827c4d69a2bd0e5b213544f.zip CMake-54863e28ce8efe9d1827c4d69a2bd0e5b213544f.tar.gz CMake-54863e28ce8efe9d1827c4d69a2bd0e5b213544f.tar.bz2 | |
Merge topic 'rename-macho-version-properties'
14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4452
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCommonTargetGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx index 5ff6f8c..033cb60 100644 --- a/Source/cmCommonTargetGenerator.cxx +++ b/Source/cmCommonTargetGenerator.cxx @@ -248,7 +248,7 @@ void cmCommonTargetGenerator::AppendOSXVerFlag(std::string& flags, int major; int minor; int patch; - std::string prop = cmStrCat("OSX_", name, "_VERSION"); + std::string prop = cmStrCat("MACHO_", name, "_VERSION"); std::string fallback_prop = so ? "SOVERSION" : "VERSION"; this->GeneratorTarget->GetTargetVersionFallback(prop, fallback_prop, major, minor, patch); diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index ac7d204..9db4817 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2369,8 +2369,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt, int minor; int patch; - // OSX_CURRENT_VERSION or VERSION -> current_version - gtgt->GetTargetVersionFallback("OSX_CURRENT_VERSION", "VERSION", major, + // MACHO_CURRENT_VERSION or VERSION -> current_version + gtgt->GetTargetVersionFallback("MACHO_CURRENT_VERSION", "VERSION", major, minor, patch); std::ostringstream v; @@ -2381,8 +2381,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt, buildSettings->AddAttribute("DYLIB_CURRENT_VERSION", this->CreateString(v.str())); - // OSX_COMPATIBILITY_VERSION or SOVERSION -> compatibility_version - gtgt->GetTargetVersionFallback("OSX_COMPATIBILITY_VERSION", "SOVERSION", + // MACHO_COMPATIBILITY_VERSION or SOVERSION -> compatibility_version + gtgt->GetTargetVersionFallback("MACHO_COMPATIBILITY_VERSION", "SOVERSION", major, minor, patch); std::ostringstream vso; |