summaryrefslogtreecommitdiffstats
path: root/Help/prop_tgt/OSX_ARCHITECTURES.rst
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-09-11 12:27:58 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-09-11 12:28:05 (GMT)
commitf13d4b10775cd4d6a604a7f1b013b5d064864a41 (patch)
tree63fce951abaad4279eb6daaefe592bbcf5894223 /Help/prop_tgt/OSX_ARCHITECTURES.rst
parente9f72e9c94e17758aada77c5ba05502739242432 (diff)
parentab2e35d6144c6e666eb0cfffe144d2b93c72949b (diff)
downloadCMake-f13d4b10775cd4d6a604a7f1b013b5d064864a41.zip
CMake-f13d4b10775cd4d6a604a7f1b013b5d064864a41.tar.gz
CMake-f13d4b10775cd4d6a604a7f1b013b5d064864a41.tar.bz2
Merge topic 'replace-os-x-name-with-macos'
ab2e35d614 Replace occurrences of "Mac OS X" with "macOS" in comments fc1602456a Help: Replace occurrences of "Mac OS X" with "macOS" Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Gregor Jasny <gjasny@googlemail.com> Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Merge-request: !2351
Diffstat (limited to 'Help/prop_tgt/OSX_ARCHITECTURES.rst')
-rw-r--r--Help/prop_tgt/OSX_ARCHITECTURES.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Help/prop_tgt/OSX_ARCHITECTURES.rst b/Help/prop_tgt/OSX_ARCHITECTURES.rst
index cefe03f..996a4be 100644
--- a/Help/prop_tgt/OSX_ARCHITECTURES.rst
+++ b/Help/prop_tgt/OSX_ARCHITECTURES.rst
@@ -1,10 +1,10 @@
OSX_ARCHITECTURES
-----------------
-Target specific architectures for OS X.
+Target specific architectures for macOS.
The ``OSX_ARCHITECTURES`` property sets the target binary architecture for
-targets on OS X (``-arch``). This property is initialized by the value of the
+targets on macOS (``-arch``). This property is initialized by the value of the
variable :variable:`CMAKE_OSX_ARCHITECTURES` if it is set when a target is
created. Use :prop_tgt:`OSX_ARCHITECTURES_<CONFIG>` to set the binary
architectures on a per-configuration basis, where ``<CONFIG>`` is an