diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-11 12:27:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-11 12:28:05 (GMT) |
| commit | f13d4b10775cd4d6a604a7f1b013b5d064864a41 (patch) | |
| tree | 63fce951abaad4279eb6daaefe592bbcf5894223 /Modules | |
| parent | e9f72e9c94e17758aada77c5ba05502739242432 (diff) | |
| parent | ab2e35d6144c6e666eb0cfffe144d2b93c72949b (diff) | |
| download | CMake-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 'Modules')
| -rw-r--r-- | Modules/CPack.cmake | 2 | ||||
| -rw-r--r-- | Modules/CPackComponent.cmake | 6 | ||||
| -rw-r--r-- | Modules/FindBoost.cmake | 4 | ||||
| -rw-r--r-- | Modules/ProcessorCount.cmake | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index cdc38a6..f3e3423 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -19,7 +19,7 @@ command (and the deprecated :command:`install_files`, :command:`install_programs` and :command:`install_targets` commands). For certain kinds of binary installers (including the graphical -installers on Mac OS X and Windows), CPack generates installers that +installers on macOS and Windows), CPack generates installers that allow users to select individual application components to install. See :module:`CPackComponent` module for further details. diff --git a/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake index 6c122e5..a0d9935 100644 --- a/Modules/CPackComponent.cmake +++ b/Modules/CPackComponent.cmake @@ -14,7 +14,7 @@ # part of CPack. See CPack module for general information about CPack. # # For certain kinds of binary installers (including the graphical -# installers on Mac OS X and Windows), CPack generates installers that +# installers on macOS and Windows), CPack generates installers that # allow users to select individual application components to install. # The contents of each of the components are identified by the COMPONENT # argument of CMake's INSTALL command. These components can be @@ -283,8 +283,8 @@ # # # -# On Mac OS X, installers that download components on-the-fly can only -# be built and installed on system using Mac OS X 10.5 or later. +# On macOS, installers that download components on-the-fly can only +# be built and installed on system using macOS 10.5 or later. # # The site argument is a URL where the archives for downloadable # components will reside, e.g., diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index f65a493..24ee1f2 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -493,11 +493,11 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret) if(Boost_MINOR_VERSION) if(${Boost_MINOR_VERSION} GREATER 35) # In Boost 1.36.0 and newer, the mangled compiler name used - # on Mac OS X/Darwin is "xgcc". + # on macOS/Darwin is "xgcc". set(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}") else() # In Boost <= 1.35.0, there is no mangled compiler name for - # the Mac OS X/Darwin version of GCC. + # the macOS/Darwin version of GCC. set(_boost_COMPILER "") endif() else() diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake index 772a615..8a37884 100644 --- a/Modules/ProcessorCount.cmake +++ b/Modules/ProcessorCount.cmake @@ -12,7 +12,7 @@ # Sets the variable named ${var} to the number of physical cores # available on the machine if the information can be determined. # Otherwise it is set to 0. Currently this functionality is implemented -# for AIX, cygwin, FreeBSD, HPUX, IRIX, Linux, Mac OS X, QNX, Sun and +# for AIX, cygwin, FreeBSD, HPUX, IRIX, Linux, macOS, QNX, Sun and # Windows. # # This function is guaranteed to return a positive integer (>=1) if it |