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

11 files changed, 44 insertions, 44 deletions

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index a5342c627f..060a072bfa 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -285,6 +285,8 @@ Properties on Targets
    /prop_tgt/LINK_WHAT_YOU_USE
    /prop_tgt/LOCATION_CONFIG
    /prop_tgt/LOCATION
+   /prop_tgt/MACHO_COMPATIBILITY_VERSION
+   /prop_tgt/MACHO_CURRENT_VERSION
    /prop_tgt/MACOSX_BUNDLE_INFO_PLIST
    /prop_tgt/MACOSX_BUNDLE
    /prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST
@@ -303,8 +305,6 @@ Properties on Targets
    /prop_tgt/OBJCXX_STANDARD_REQUIRED
    /prop_tgt/OSX_ARCHITECTURES_CONFIG
    /prop_tgt/OSX_ARCHITECTURES
-   /prop_tgt/OSX_CURRENT_VERSION
-   /prop_tgt/OSX_COMPATIBILITY_VERSION
    /prop_tgt/OUTPUT_NAME_CONFIG
    /prop_tgt/OUTPUT_NAME
    /prop_tgt/PDB_NAME_CONFIG
diff --git a/Help/prop_tgt/MACHO_COMPATIBILITY_VERSION.rst b/Help/prop_tgt/MACHO_COMPATIBILITY_VERSION.rst
new file mode 100644
index 0000000000..f3fedbabe8
--- /dev/null
+++ b/Help/prop_tgt/MACHO_COMPATIBILITY_VERSION.rst
@@ -0,0 +1,14 @@
+MACHO_COMPATIBILITY_VERSION
+---------------------------
+
+What compatibility version number is this target for Mach-O binaries.
+
+For shared libraries on Mach-O systems (e.g. macOS, iOS)
+the ``MACHO_COMPATIBILITY_VERSION`` property correspond to
+``compatibility version`` and :prop_tgt:`MACHO_CURRENT_VERSION` to
+``current version``.
+See the :prop_tgt:`FRAMEWORK` target property for an example.
+
+Versions of Mach-O binaries may be checked with the ``otool -L <binary>``
+command.  If ``MACHO_COMPATIBILITY_VERSION`` is not set, the value of
+the :prop_tgt:`SOVERSION` property will be used.
diff --git a/Help/prop_tgt/MACHO_CURRENT_VERSION.rst b/Help/prop_tgt/MACHO_CURRENT_VERSION.rst
new file mode 100644
index 0000000000..4a1d3f0638
--- /dev/null
+++ b/Help/prop_tgt/MACHO_CURRENT_VERSION.rst
@@ -0,0 +1,13 @@
+MACHO_CURRENT_VERSION
+---------------------
+
+What current version number is this target for Mach-O binaries.
+
+For shared libraries on Mach-O systems (e.g. macOS, iOS)
+the :prop_tgt:`MACHO_COMPATIBILITY_VERSION` property correspond to
+``compatibility version`` and ``MACHO_CURRENT_VERSION`` to ``current version``.
+See the :prop_tgt:`FRAMEWORK` target property for an example.
+
+Versions of Mach-O binaries may be checked with the ``otool -L <binary>``
+command.  If ``MACHO_CURRENT_VERSION`` is not set, the value of
+the :prop_tgt:`VERSION` property will be used.
diff --git a/Help/prop_tgt/OSX_COMPATIBILITY_VERSION.rst b/Help/prop_tgt/OSX_COMPATIBILITY_VERSION.rst
deleted file mode 100644
index 5432b9a7d3..0000000000
--- a/Help/prop_tgt/OSX_COMPATIBILITY_VERSION.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-OSX_COMPATIBILITY_VERSION
--------------------------
-
-What compatibility version number is this target for OSX.
-
-For shared libraries on Mach-O systems (e.g. macOS, iOS)
-the ``OSX_COMPATIBILITY_VERSION`` property correspond to
-``compatibility version`` and :prop_tgt:`OSX_CURRENT_VERSION` to
-``current version``.
-See the :prop_tgt:`FRAMEWORK` target property for an example.
-
-Versions of Mach-O binaries may be checked with the ``otool -L <binary>``
-command.  If ``OSX_COMPATIBILITY_VERSION`` is not set, the value of
-the :prop_tgt:``SOVERSION`` property will be used.
diff --git a/Help/prop_tgt/OSX_CURRENT_VERSION.rst b/Help/prop_tgt/OSX_CURRENT_VERSION.rst
deleted file mode 100644
index 609924d4a4..0000000000
--- a/Help/prop_tgt/OSX_CURRENT_VERSION.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-OSX_CURRENT_VERSION
--------------------
-
-What current version number is this target for OSX.
-
-For shared libraries on Mach-O systems (e.g. macOS, iOS)
-the :prop_tgt:`OSX_COMPATIBILITY_VERSION` property correspond to
-``compatibility version`` and ``OSX_CURRENT_VERSION`` to ``current version``.
-See the :prop_tgt:`FRAMEWORK` target property for an example.
-
-Versions of Mach-O binaries may be checked with the ``otool -L <binary>``
-command.  If ``OSX_CURRENT_VERSION`` is not set, the value of
-the :prop_tgt:``VERSION`` property will be used.
diff --git a/Help/prop_tgt/SOVERSION.rst b/Help/prop_tgt/SOVERSION.rst
index 1a66c8f892..d6f8a941f7 100644
--- a/Help/prop_tgt/SOVERSION.rst
+++ b/Help/prop_tgt/SOVERSION.rst
@@ -22,8 +22,8 @@ Mach-O Versions
 
 For shared libraries and executables on Mach-O systems (e.g. macOS, iOS),
 the ``SOVERSION`` property is a fallback to
-:prop_tgt:`OSX_COMPATIBILITY_VERSION` property which corresponds to
+:prop_tgt:`MACHO_COMPATIBILITY_VERSION` property which corresponds to
 *compatiblity version* and :prop_tgt:`VERSION` is a fallback to
-:prop_tgt:`OSX_CURRENT_VERSION` which corresponds to *current version*.
+:prop_tgt:`MACHO_CURRENT_VERSION` which corresponds to *current version*.
 See the :prop_tgt:`FRAMEWORK` target property for an example.  Versions
 of Mach-O binaries may be checked with the ``otool -L <binary>`` command.
diff --git a/Help/prop_tgt/VERSION.rst b/Help/prop_tgt/VERSION.rst
index a24b613089..f592f4a611 100644
--- a/Help/prop_tgt/VERSION.rst
+++ b/Help/prop_tgt/VERSION.rst
@@ -23,9 +23,9 @@ Mach-O Versions
 ^^^^^^^^^^^^^^^
 
 For shared libraries and executables on Mach-O systems (e.g. macOS, iOS),
-the ``VERSION`` property is a fallback to :prop_tgt:`OSX_CURRENT_VERSION`
+the ``VERSION`` property is a fallback to :prop_tgt:`MACHO_CURRENT_VERSION`
 property which corresponds to *current version* and :prop_tgt:`SOVERSION`
-is a fallback to :prop_tgt:`OSX_COMPATIBILITY_VERSION` which corresponds
+is a fallback to :prop_tgt:`MACHO_COMPATIBILITY_VERSION` which corresponds
 to *compatiblity version*.  See the :prop_tgt:`FRAMEWORK` target
 property for an example.  Versions of Mach-O binaries may be checked with the
 ``otool -L <binary>`` command.
diff --git a/Help/release/3.17.rst b/Help/release/3.17.rst
index f2c4d85abb..c2cfdf03f7 100644
--- a/Help/release/3.17.rst
+++ b/Help/release/3.17.rst
@@ -143,10 +143,10 @@ Properties
   In particular, the ``$<INSTALL_PREFIX>`` generator expression can
   be used to set the directory relative to the install-time prefix.
 
-* Target properties :prop_tgt:`OSX_COMPATIBILITY_VERSION` and
-  :prop_tgt:`OSX_CURRENT_VERSION` were added to set the
-  ``compatibility_version`` and ``curent_version`` respectively
-  on macOS. For backwards compatibility, if these properties
+* Target properties :prop_tgt:`MACHO_COMPATIBILITY_VERSION` and
+  :prop_tgt:`MACHO_CURRENT_VERSION` were added to set the
+  ``compatibility_version`` and ``curent_version``, respectively,
+  for Mach-O binaries.  For backwards compatibility, if these properties
   are not set, :prop_tgt:`SOVERSION` and :prop_tgt:`VERSION`
   are used respectively as fallbacks.
 
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 5ff6f8cee2..033cb6039f 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 c48a376679..e0005a4ed1 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;
 
diff --git a/Tests/RunCMake/MacOSVersions/MacOSVersions.cmake b/Tests/RunCMake/MacOSVersions/MacOSVersions.cmake
index 629e4452a5..fc51bd8844 100644
--- a/Tests/RunCMake/MacOSVersions/MacOSVersions.cmake
+++ b/Tests/RunCMake/MacOSVersions/MacOSVersions.cmake
@@ -4,6 +4,6 @@ add_library(foo SHARED foo.c)
 set_target_properties(foo PROPERTIES
   VERSION 1.0
   SOVERSION 1
-  OSX_COMPATIBILITY_VERSION 2.1.0
-  OSX_CURRENT_VERSION 3.2.1
+  MACHO_COMPATIBILITY_VERSION 2.1.0
+  MACHO_CURRENT_VERSION 3.2.1
   )