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 | 3d388e5e986b7053d25cd319400e1e21410cf9c3 (patch) | |
| tree | 9f5a64f765cf3544113d0e7c0e4238d8be34efd1 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | dd45b7b429ee70adfbaa522e42b9e51afcd1522d (diff) | |
| parent | 14732d3f3013479440af0e702b3c82c490365a64 (diff) | |
| download | CMake-3d388e5e986b7053d25cd319400e1e21410cf9c3.zip CMake-3d388e5e986b7053d25cd319400e1e21410cf9c3.tar.gz CMake-3d388e5e986b7053d25cd319400e1e21410cf9c3.tar.bz2 | |
Merge topic 'rename-macho-version-properties' into release-3.17
14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4452
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index c48a376..e0005a4 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2368,8 +2368,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; @@ -2380,8 +2380,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; |