diff options
46 files changed, 115 insertions, 115 deletions
diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt index 38c231a670..73dbd57742 100644 --- a/Help/command/FIND_XXX.txt +++ b/Help/command/FIND_XXX.txt @@ -137,7 +137,7 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows: .. |FIND_ARGS_XXX| replace:: <VAR> NAMES name -On OS X the :variable:`CMAKE_FIND_FRAMEWORK` and +On macOS the :variable:`CMAKE_FIND_FRAMEWORK` and :variable:`CMAKE_FIND_APPBUNDLE` variables determine the order of preference between Apple-style and unix-style package components. diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst index b7ba724b48..c4c512c0e2 100644 --- a/Help/command/add_library.rst +++ b/Help/command/add_library.rst @@ -35,7 +35,7 @@ variable :variable:`BUILD_SHARED_LIBS` is ``ON``. For ``SHARED`` and ``MODULE`` libraries the :prop_tgt:`POSITION_INDEPENDENT_CODE` target property is set to ``ON`` automatically. A ``SHARED`` or ``STATIC`` library may be marked with the :prop_tgt:`FRAMEWORK` -target property to create an OS X Framework. +target property to create an macOS Framework. If a library does not export any symbols, it must not be declared as a ``SHARED`` library. For example, a Windows resource DLL or a managed C++/CLI diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index bbe8c4deb1..b486b7967c 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -216,7 +216,7 @@ Each entry is meant for installation trees following Windows (W), UNIX <prefix>/<name>*/(lib/<arch>|lib*|share)/<name>*/ (W/U) <prefix>/<name>*/(lib/<arch>|lib*|share)/<name>*/(cmake|CMake)/ (W/U) -On systems supporting OS X Frameworks and Application Bundles the +On systems supporting macOS Frameworks and Application Bundles the following directories are searched for frameworks or bundles containing a configuration file:: diff --git a/Help/command/install.rst b/Help/command/install.rst index 8b2a971212..3a2b4da621 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -115,19 +115,19 @@ project. There are several kinds of target files that may be installed: ``ARCHIVE`` Static libraries are treated as ``ARCHIVE`` targets, except those - marked with the ``FRAMEWORK`` property on OS X (see ``FRAMEWORK`` + marked with the ``FRAMEWORK`` property on macOS (see ``FRAMEWORK`` below.) For DLL platforms (all Windows-based systems including Cygwin), the DLL import library is treated as an ``ARCHIVE`` target. ``LIBRARY`` Module libraries are always treated as ``LIBRARY`` targets. For non- DLL platforms shared libraries are treated as ``LIBRARY`` targets, - except those marked with the ``FRAMEWORK`` property on OS X (see + except those marked with the ``FRAMEWORK`` property on macOS (see ``FRAMEWORK`` below.) ``RUNTIME`` Executables are treated as ``RUNTIME`` objects, except those marked - with the ``MACOSX_BUNDLE`` property on OS X (see ``BUNDLE`` below.) + with the ``MACOSX_BUNDLE`` property on macOS (see ``BUNDLE`` below.) For DLL platforms (all Windows-based systems including Cygwin), the DLL part of a shared library is treated as a ``RUNTIME`` target. @@ -137,11 +137,11 @@ project. There are several kinds of target files that may be installed: ``FRAMEWORK`` Both static and shared libraries marked with the ``FRAMEWORK`` - property are treated as ``FRAMEWORK`` targets on OS X. + property are treated as ``FRAMEWORK`` targets on macOS. ``BUNDLE`` Executables marked with the ``MACOSX_BUNDLE`` property are treated as - ``BUNDLE`` targets on OS X. + ``BUNDLE`` targets on macOS. ``PUBLIC_HEADER`` Any ``PUBLIC_HEADER`` files associated with a library are installed in diff --git a/Help/cpack_gen/bundle.rst b/Help/cpack_gen/bundle.rst index 4628968bd3..29727e2e96 100644 --- a/Help/cpack_gen/bundle.rst +++ b/Help/cpack_gen/bundle.rst @@ -1,14 +1,14 @@ CPack Bundle Generator ---------------------- -CPack Bundle generator (Mac OS X) specific options +CPack Bundle generator (macOS) specific options Variables specific to CPack Bundle generator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Installers built on Mac OS X using the Bundle generator use the -aforementioned DragNDrop (CPACK_DMG_xxx) variables, plus the following -Bundle-specific parameters (CPACK_BUNDLE_xxx). +Installers built on macOS using the Bundle generator use the +aforementioned DragNDrop (``CPACK_DMG_xxx``) variables, plus the following +Bundle-specific parameters (``CPACK_BUNDLE_xxx``). .. variable:: CPACK_BUNDLE_NAME @@ -25,7 +25,7 @@ Bundle-specific parameters (CPACK_BUNDLE_xxx). Path to an OSX icon file that will be used as the icon for the generated bundle. This is the icon that appears in the OSX finder for the bundle, and - in the OSX dock when the bundle is opened. Required. + in the OSX dock when the bundle is opened. Required. .. variable:: CPACK_BUNDLE_STARTUP_COMMAND @@ -36,13 +36,13 @@ Bundle-specific parameters (CPACK_BUNDLE_xxx). .. variable:: CPACK_BUNDLE_APPLE_CERT_APP The name of your Apple supplied code signing certificate for the application. - The name usually takes the form "Developer ID Application: [Name]" or - "3rd Party Mac Developer Application: [Name]". If this variable is not set + The name usually takes the form ``Developer ID Application: [Name]`` or + ``3rd Party Mac Developer Application: [Name]``. If this variable is not set the application will not be signed. .. variable:: CPACK_BUNDLE_APPLE_ENTITLEMENTS - The name of the plist file that contains your apple entitlements for sandboxing + The name of the ``Plist`` file that contains your apple entitlements for sandboxing your application. This file is required for submission to the Mac App Store. .. variable:: CPACK_BUNDLE_APPLE_CODESIGN_FILES @@ -53,12 +53,12 @@ Bundle-specific parameters (CPACK_BUNDLE_xxx). .. variable:: CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER - Additional parameter that will passed to codesign. - Default value: "--deep -f" + Additional parameter that will passed to ``codesign``. + Default value: ``--deep -f`` .. variable:: CPACK_COMMAND_CODESIGN - Path to the codesign(1) command used to sign applications with an + Path to the ``codesign(1)`` command used to sign applications with an Apple cert. This variable can be used to override the automatically detected command (or specify its location if the auto-detection fails - to find it.) + to find it). diff --git a/Help/cpack_gen/dmg.rst b/Help/cpack_gen/dmg.rst index e4482ef98f..b7b3a0a13c 100644 --- a/Help/cpack_gen/dmg.rst +++ b/Help/cpack_gen/dmg.rst @@ -1,13 +1,13 @@ CPack DMG Generator ------------------- -DragNDrop CPack generator (Mac OS X). +DragNDrop CPack generator (macOS). Variables specific to CPack DragNDrop generator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The following variables are specific to the DragNDrop installers built -on Mac OS X: +on macOS: .. variable:: CPACK_DMG_VOLUME_NAME @@ -16,33 +16,33 @@ on Mac OS X: .. variable:: CPACK_DMG_FORMAT - The disk image format. Common values are UDRO (UDIF read-only), UDZO (UDIF - zlib-compressed) or UDBZ (UDIF bzip2-compressed). Refer to hdiutil(1) for - more information on other available formats. Defaults to UDZO. + The disk image format. Common values are ``UDRO`` (UDIF read-only), ``UDZO`` (UDIF + zlib-compressed) or ``UDBZ`` (UDIF bzip2-compressed). Refer to ``hdiutil(1)`` for + more information on other available formats. Defaults to ``UDZO``. .. variable:: CPACK_DMG_DS_STORE - Path to a custom DS_Store file. This .DS_Store file e.g. can be used to + Path to a custom ``.DS_Store`` file. This ``.DS_Store`` file can be used to specify the Finder window position/geometry and layout (such as hidden toolbars, placement of the icons etc.). This file has to be generated by the Finder (either manually or through AppleScript) using a normal folder - from which the .DS_Store file can then be extracted. + from which the ``.DS_Store`` file can then be extracted. .. variable:: CPACK_DMG_DS_STORE_SETUP_SCRIPT Path to a custom AppleScript file. This AppleScript is used to generate - a .DS_Store file which specifies the Finder window position/geometry and + a ``.DS_Store`` file which specifies the Finder window position/geometry and layout (such as hidden toolbars, placement of the icons etc.). By specifying a custom AppleScript there is no need to use - CPACK_DMG_DS_STORE, as the .DS_Store that is generated by the AppleScript + ``CPACK_DMG_DS_STORE``, as the ``.DS_Store`` that is generated by the AppleScript will be packaged. .. variable:: CPACK_DMG_BACKGROUND_IMAGE Path to an image file to be used as the background. This file will be - copied to .background/background.<ext>, where ext is the original image file + copied to ``.background``/``background.<ext>``, where ``<ext>`` is the original image file extension. The background image is installed into the image before - CPACK_DMG_DS_STORE_SETUP_SCRIPT is executed or CPACK_DMG_DS_STORE is + ``CPACK_DMG_DS_STORE_SETUP_SCRIPT`` is executed or ``CPACK_DMG_DS_STORE`` is installed. By default no background image is set. .. variable:: CPACK_DMG_DISABLE_APPLICATIONS_SYMLINK @@ -83,19 +83,19 @@ on Mac OS X: .. variable:: CPACK_COMMAND_HDIUTIL - Path to the hdiutil(1) command used to operate on disk image files on Mac - OS X. This variable can be used to override the automatically detected - command (or specify its location if the auto-detection fails to find it.) + Path to the ``hdiutil(1)`` command used to operate on disk image files on + macOS. This variable can be used to override the automatically detected + command (or specify its location if the auto-detection fails to find it). .. variable:: CPACK_COMMAND_SETFILE - Path to the SetFile(1) command used to set extended attributes on files and - directories on Mac OS X. This variable can be used to override the + Path to the ``SetFile(1)`` command used to set extended attributes on files and + directories on macOS. This variable can be used to override the automatically detected command (or specify its location if the - auto-detection fails to find it.) + auto-detection fails to find it). .. variable:: CPACK_COMMAND_REZ - Path to the Rez(1) command used to compile resources on Mac OS X. This + Path to the ``Rez(1)`` command used to compile resources on macOS. This variable can be used to override the automatically detected command (or - specify its location if the auto-detection fails to find it.) + specify its location if the auto-detection fails to find it). diff --git a/Help/cpack_gen/ifw.rst b/Help/cpack_gen/ifw.rst index 68776e1adf..e43b1d6465 100644 --- a/Help/cpack_gen/ifw.rst +++ b/Help/cpack_gen/ifw.rst @@ -17,7 +17,7 @@ and meta information for QtIFW_ tools. The QtIFW_ provides a set of tools and utilities to create installers for the supported desktop Qt platforms: Linux, Microsoft Windows, -and Mac OS X. +and macOS. You should also install QtIFW_ to use CPack ``IFW`` generator. @@ -107,7 +107,7 @@ Package .. variable:: CPACK_IFW_PACKAGE_ICON - Filename for a custom installer icon. The actual file is '.icns' (Mac OS X), + Filename for a custom installer icon. The actual file is '.icns' (macOS), '.ico' (Windows). No functionality on Unix. .. variable:: CPACK_IFW_PACKAGE_WINDOW_ICON diff --git a/Help/cpack_gen/packagemaker.rst b/Help/cpack_gen/packagemaker.rst index f9abdd8944..e9464b749a 100644 --- a/Help/cpack_gen/packagemaker.rst +++ b/Help/cpack_gen/packagemaker.rst @@ -1,23 +1,23 @@ CPack PackageMaker Generator ---------------------------- -PackageMaker CPack generator (Mac OS X). +PackageMaker CPack generator (macOS). Variables specific to CPack PackageMaker generator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The following variable is specific to installers built on Mac -OS X using PackageMaker: +macOS using PackageMaker: .. variable:: CPACK_OSX_PACKAGE_VERSION - The version of Mac OS X that the resulting PackageMaker archive should be - compatible with. Different versions of Mac OS X support different + The version of macOS that the resulting PackageMaker archive should be + compatible with. Different versions of macOS support different features. For example, CPack can only build component-based installers for - Mac OS X 10.4 or newer, and can only build installers that download - component son-the-fly for Mac OS X 10.5 or newer. If left blank, this value - will be set to the minimum version of Mac OS X that supports the requested + macOS 10.4 or newer, and can only build installers that download + component son-the-fly for macOS 10.5 or newer. If left blank, this value + will be set to the minimum version of macOS that supports the requested features. Set this variable to some value (e.g., 10.4) only if you want to - guarantee that your installer will work on that version of Mac OS X, and + guarantee that your installer will work on that version of macOS, and don't mind missing extra features available in the installer shipping with - later versions of Mac OS X. + later versions of macOS. diff --git a/Help/cpack_gen/productbuild.rst b/Help/cpack_gen/productbuild.rst index 1a6e0f8093..d22fcd48a5 100644 --- a/Help/cpack_gen/productbuild.rst +++ b/Help/cpack_gen/productbuild.rst @@ -1,20 +1,20 @@ CPack productbuild Generator ---------------------------- -productbuild CPack generator (Mac OS X). +productbuild CPack generator (macOS). Variables specific to CPack productbuild generator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The following variable is specific to installers built on Mac -OS X using ProductBuild: +macOS using ProductBuild: .. variable:: CPACK_COMMAND_PRODUCTBUILD - Path to the productbuild(1) command used to generate a product archive for - the OS X Installer or Mac App Store. This variable can be used to override + Path to the ``productbuild(1)`` command used to generate a product archive for + the macOS Installer or Mac App Store. This variable can be used to override the automatically detected command (or specify its location if the - auto-detection fails to find it.) + auto-detection fails to find it). .. variable:: CPACK_PRODUCTBUILD_IDENTITY_NAME @@ -28,9 +28,9 @@ OS X using ProductBuild: .. variable:: CPACK_COMMAND_PKGBUILD - Path to the pkgbuild(1) command used to generate an OS X component package - on OS X. This variable can be used to override the automatically detected - command (or specify its location if the auto-detection fails to find it.) + Path to the ``pkgbuild(1)`` command used to generate an macOS component package + on macOS. This variable can be used to override the automatically detected + command (or specify its location if the auto-detection fails to find it). .. variable:: CPACK_PKGBUILD_IDENTITY_NAME diff --git a/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst b/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst index 8bbf993bdd..5fd6e52237 100644 --- a/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst +++ b/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst @@ -1,7 +1,7 @@ CMAKE_OSX_ARCHITECTURES ----------------------- -Target specific architectures for OS X. +Target specific architectures for macOS. The ``CMAKE_OSX_ARCHITECTURES`` environment variable sets the default value for the :variable:`CMAKE_OSX_ARCHITECTURES` variable. See diff --git a/Help/envvar/MACOSX_DEPLOYMENT_TARGET.rst b/Help/envvar/MACOSX_DEPLOYMENT_TARGET.rst index e6051b44a0..9dafa32347 100644 --- a/Help/envvar/MACOSX_DEPLOYMENT_TARGET.rst +++ b/Help/envvar/MACOSX_DEPLOYMENT_TARGET.rst @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET ------------------------ -Specify the minimum version of OS X on which the target binaries are +Specify the minimum version of macOS on which the target binaries are to be deployed. The ``MACOSX_DEPLOYMENT_TARGET`` environment variable sets the default value for diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst index dd7934a70f..4fc484b2d6 100644 --- a/Help/manual/cmake-buildsystem.7.rst +++ b/Help/manual/cmake-buildsystem.7.rst @@ -95,7 +95,7 @@ Apple Frameworks """""""""""""""" A ``SHARED`` library may be marked with the :prop_tgt:`FRAMEWORK` -target property to create an OS X or iOS Framework Bundle. +target property to create an macOS or iOS Framework Bundle. The ``MACOSX_FRAMEWORK_IDENTIFIER`` sets ``CFBundleIdentifier`` key and it uniquely identifies the bundle. diff --git a/Help/prop_sf/MACOSX_PACKAGE_LOCATION.rst b/Help/prop_sf/MACOSX_PACKAGE_LOCATION.rst index a064afa634..d185d91978 100644 --- a/Help/prop_sf/MACOSX_PACKAGE_LOCATION.rst +++ b/Help/prop_sf/MACOSX_PACKAGE_LOCATION.rst @@ -3,19 +3,19 @@ MACOSX_PACKAGE_LOCATION Place a source file inside a Application Bundle (:prop_tgt:`MACOSX_BUNDLE`), Core Foundation Bundle (:prop_tgt:`BUNDLE`), -or Framework Bundle (:prop_tgt:`FRAMEWORK`). It is applicable for OS X +or Framework Bundle (:prop_tgt:`FRAMEWORK`). It is applicable for macOS and iOS. Executable targets with the :prop_tgt:`MACOSX_BUNDLE` property set are -built as OS X or iOS application bundles on Apple platforms. Shared +built as macOS or iOS application bundles on Apple platforms. Shared library targets with the :prop_tgt:`FRAMEWORK` property set are built as -OS X or iOS frameworks on Apple platforms. Module library targets with -the :prop_tgt:`BUNDLE` property set are built as OS X ``CFBundle`` bundles +macOS or iOS frameworks on Apple platforms. Module library targets with +the :prop_tgt:`BUNDLE` property set are built as macOS ``CFBundle`` bundles on Apple platforms. Source files listed in the target with this property set will be copied to a directory inside the bundle or framework content -folder specified by the property value. For OS X Application Bundles the -content folder is ``<name>.app/Contents``. For OS X Frameworks the -content folder is ``<name>.framework/Versions/<version>``. For OS X +folder specified by the property value. For macOS Application Bundles the +content folder is ``<name>.app/Contents``. For macOS Frameworks the +content folder is ``<name>.framework/Versions/<version>``. For macOS CFBundles the content folder is ``<name>.bundle/Contents`` (unless the extension is changed). See the :prop_tgt:`PUBLIC_HEADER`, :prop_tgt:`PRIVATE_HEADER`, and :prop_tgt:`RESOURCE` target properties for diff --git a/Help/prop_tgt/BUNDLE.rst b/Help/prop_tgt/BUNDLE.rst index 075f017df5..c556ac32cf 100644 --- a/Help/prop_tgt/BUNDLE.rst +++ b/Help/prop_tgt/BUNDLE.rst @@ -1,7 +1,7 @@ BUNDLE ------ -This target is a ``CFBundle`` on the OS X. +This target is a ``CFBundle`` on the macOS. If a module library target has this property set to true it will be built as a ``CFBundle`` when built on the mac. It will have the directory diff --git a/Help/prop_tgt/BUNDLE_EXTENSION.rst b/Help/prop_tgt/BUNDLE_EXTENSION.rst index 6b3d58023c..70de11c403 100644 --- a/Help/prop_tgt/BUNDLE_EXTENSION.rst +++ b/Help/prop_tgt/BUNDLE_EXTENSION.rst @@ -2,7 +2,7 @@ BUNDLE_EXTENSION ---------------- The file extension used to name a :prop_tgt:`BUNDLE`, a :prop_tgt:`FRAMEWORK`, -or a :prop_tgt:`MACOSX_BUNDLE` target on the OS X and iOS. +or a :prop_tgt:`MACOSX_BUNDLE` target on the macOS and iOS. The default value is ``bundle``, ``framework``, or ``app`` for the respective target types. diff --git a/Help/prop_tgt/ENABLE_EXPORTS.rst b/Help/prop_tgt/ENABLE_EXPORTS.rst index 9e22309717..581c2b90c4 100644 --- a/Help/prop_tgt/ENABLE_EXPORTS.rst +++ b/Help/prop_tgt/ENABLE_EXPORTS.rst @@ -12,7 +12,7 @@ dependency on the executable is created for targets that link to it. For DLL platforms an import library will be created for the exported symbols and then used for linking. All Windows-based systems including Cygwin are DLL platforms. For non-DLL platforms that -require all symbols to be resolved at link time, such as OS X, the +require all symbols to be resolved at link time, such as macOS, the module will "link" to the executable using a flag like ``-bundle_loader``. For other non-DLL platforms the link rule is simply ignored since the dynamic loader will automatically bind symbols when diff --git a/Help/prop_tgt/FRAMEWORK.rst b/Help/prop_tgt/FRAMEWORK.rst index 495d30e95a..9dad06052a 100644 --- a/Help/prop_tgt/FRAMEWORK.rst +++ b/Help/prop_tgt/FRAMEWORK.rst @@ -1,17 +1,17 @@ FRAMEWORK --------- -Build ``SHARED`` or ``STATIC`` library as Framework Bundle on the OS X and iOS. +Build ``SHARED`` or ``STATIC`` library as Framework Bundle on the macOS and iOS. If such a library target has this property set to ``TRUE`` it will be -built as a framework when built on the OS X and iOS. It will have the +built as a framework when built on the macOS and iOS. It will have the directory structure required for a framework and will be suitable to be used with the ``-framework`` option To customize ``Info.plist`` file in the framework, use :prop_tgt:`MACOSX_FRAMEWORK_INFO_PLIST` target property. -For OS X see also the :prop_tgt:`FRAMEWORK_VERSION` target property. +For macOS see also the :prop_tgt:`FRAMEWORK_VERSION` target property. Example of creation ``dynamicFramework``: diff --git a/Help/prop_tgt/FRAMEWORK_VERSION.rst b/Help/prop_tgt/FRAMEWORK_VERSION.rst index 6aa30268a9..c2ae7b98f6 100644 --- a/Help/prop_tgt/FRAMEWORK_VERSION.rst +++ b/Help/prop_tgt/FRAMEWORK_VERSION.rst @@ -4,5 +4,5 @@ FRAMEWORK_VERSION Version of a framework created using the :prop_tgt:`FRAMEWORK` target property (e.g. ``A``). -This property only affects OS X, as iOS doesn't have versioned +This property only affects macOS, as iOS doesn't have versioned directory structure. diff --git a/Help/prop_tgt/IMPORTED_LOCATION.rst b/Help/prop_tgt/IMPORTED_LOCATION.rst index 8cfef7343b..2d07aadcf7 100644 --- a/Help/prop_tgt/IMPORTED_LOCATION.rst +++ b/Help/prop_tgt/IMPORTED_LOCATION.rst @@ -5,11 +5,11 @@ Full path to the main file on disk for an IMPORTED target. Set this to the location of an IMPORTED target file on disk. For executables this is the location of the executable file. For bundles -on OS X this is the location of the executable file inside +on macOS this is the location of the executable file inside Contents/MacOS under the application bundle folder. For static libraries and modules this is the location of the library or module. For shared libraries on non-DLL platforms this is the location of the -shared library. For frameworks on OS X this is the location of the +shared library. For frameworks on macOS this is the location of the library file symlink just inside the framework folder. For DLLs this is the location of the ".dll" part of the library. For UNKNOWN libraries this is the location of the file to be linked. Ignored for diff --git a/Help/prop_tgt/MACOSX_BUNDLE.rst b/Help/prop_tgt/MACOSX_BUNDLE.rst index f9e11ee3e2..92bce53eee 100644 --- a/Help/prop_tgt/MACOSX_BUNDLE.rst +++ b/Help/prop_tgt/MACOSX_BUNDLE.rst @@ -1,9 +1,9 @@ MACOSX_BUNDLE ------------- -Build an executable as an Application Bundle on OS X or iOS. +Build an executable as an Application Bundle on macOS or iOS. -When this property is set to ``TRUE`` the executable when built on OS X +When this property is set to ``TRUE`` the executable when built on macOS or iOS will be created as an application bundle. This makes it a GUI executable that can be launched from the Finder. See the :prop_tgt:`MACOSX_BUNDLE_INFO_PLIST` target property for information about diff --git a/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst b/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst index 8515accc23..443a645e44 100644 --- a/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst +++ b/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst @@ -1,10 +1,10 @@ MACOSX_BUNDLE_INFO_PLIST ------------------------ -Specify a custom ``Info.plist`` template for a OS X and iOS Application Bundle. +Specify a custom ``Info.plist`` template for a macOS and iOS Application Bundle. An executable target with :prop_tgt:`MACOSX_BUNDLE` enabled will be built as an -application bundle on OS X. By default its ``Info.plist`` file is created +application bundle on macOS. By default its ``Info.plist`` file is created by configuring a template called ``MacOSXBundleInfo.plist.in`` located in the :variable:`CMAKE_MODULE_PATH`. This property specifies an alternative template file name which may be a full path. diff --git a/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst b/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst index 58f31d4956..82fdcc0fb0 100644 --- a/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst +++ b/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst @@ -1,10 +1,10 @@ MACOSX_FRAMEWORK_INFO_PLIST --------------------------- -Specify a custom ``Info.plist`` template for a OS X and iOS Framework. +Specify a custom ``Info.plist`` template for a macOS and iOS Framework. A library target with :prop_tgt:`FRAMEWORK` enabled will be built as a -framework on OS X. By default its ``Info.plist`` file is created by +framework on macOS. By default its ``Info.plist`` file is created by configuring a template called ``MacOSXFrameworkInfo.plist.in`` located in the :variable:`CMAKE_MODULE_PATH`. This property specifies an alternative template file name which may be a full path. diff --git a/Help/prop_tgt/MACOSX_RPATH.rst b/Help/prop_tgt/MACOSX_RPATH.rst index 1f9a036bfe..acd5a7aa48 100644 --- a/Help/prop_tgt/MACOSX_RPATH.rst +++ b/Help/prop_tgt/MACOSX_RPATH.rst @@ -1,7 +1,7 @@ MACOSX_RPATH ------------ -Whether this target on OS X or iOS is located at runtime using rpaths. +Whether this target on macOS or iOS is located at runtime using rpaths. When this property is set to ``TRUE``, the directory portion of the ``install_name`` field of this shared library will be ``@rpath`` diff --git a/Help/prop_tgt/OSX_ARCHITECTURES.rst b/Help/prop_tgt/OSX_ARCHITECTURES.rst index cefe03f5b5..996a4be721 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 diff --git a/Help/prop_tgt/OSX_ARCHITECTURES_CONFIG.rst b/Help/prop_tgt/OSX_ARCHITECTURES_CONFIG.rst index fb78177fbb..06da4fb09d 100644 --- a/Help/prop_tgt/OSX_ARCHITECTURES_CONFIG.rst +++ b/Help/prop_tgt/OSX_ARCHITECTURES_CONFIG.rst @@ -1,7 +1,7 @@ OSX_ARCHITECTURES_<CONFIG> -------------------------- -Per-configuration OS X and iOS binary architectures for a target. +Per-configuration macOS and iOS binary architectures for a target. This property is the configuration-specific version of :prop_tgt:`OSX_ARCHITECTURES`. diff --git a/Help/prop_tgt/PRIVATE_HEADER.rst b/Help/prop_tgt/PRIVATE_HEADER.rst index c4412ed25d..2bd4079fad 100644 --- a/Help/prop_tgt/PRIVATE_HEADER.rst +++ b/Help/prop_tgt/PRIVATE_HEADER.rst @@ -4,7 +4,7 @@ PRIVATE_HEADER Specify private header files in a :prop_tgt:`FRAMEWORK` shared library target. Shared library targets marked with the :prop_tgt:`FRAMEWORK` property generate -frameworks on OS X, iOS and normal shared libraries on other platforms. +frameworks on macOS, iOS and normal shared libraries on other platforms. This property may be set to a list of header files to be placed in the PrivateHeaders directory inside the framework folder. On non-Apple platforms these headers may be installed using the ``PRIVATE_HEADER`` diff --git a/Help/prop_tgt/PUBLIC_HEADER.rst b/Help/prop_tgt/PUBLIC_HEADER.rst index d4a636caf9..549ac7ce12 100644 --- a/Help/prop_tgt/PUBLIC_HEADER.rst +++ b/Help/prop_tgt/PUBLIC_HEADER.rst @@ -4,7 +4,7 @@ PUBLIC_HEADER Specify public header files in a :prop_tgt:`FRAMEWORK` shared library target. Shared library targets marked with the :prop_tgt:`FRAMEWORK` property generate -frameworks on OS X, iOS and normal shared libraries on other platforms. +frameworks on macOS, iOS and normal shared libraries on other platforms. This property may be set to a list of header files to be placed in the ``Headers`` directory inside the framework folder. On non-Apple platforms these headers may be installed using the ``PUBLIC_HEADER`` option to the diff --git a/Help/prop_tgt/RESOURCE.rst b/Help/prop_tgt/RESOURCE.rst index d837f7b33f..55ae7740ba 100644 --- a/Help/prop_tgt/RESOURCE.rst +++ b/Help/prop_tgt/RESOURCE.rst @@ -4,10 +4,10 @@ RESOURCE Specify resource files in a :prop_tgt:`FRAMEWORK` or :prop_tgt:`BUNDLE`. Target marked with the :prop_tgt:`FRAMEWORK` or :prop_tgt:`BUNDLE` property -generate framework or application bundle (both OS X and iOS is supported) +generate framework or application bundle (both macOS and iOS is supported) or normal shared libraries on other platforms. This property may be set to a list of files to be placed in the corresponding -directory (eg. ``Resources`` directory for OS X) inside the bundle. +directory (eg. ``Resources`` directory for macOS) inside the bundle. On non-Apple platforms these files may be installed using the ``RESOURCE`` option to the ``install(TARGETS)`` command. @@ -42,7 +42,7 @@ will produce flat structure for iOS systems:: Info.plist resourcefile.txt -For OS X systems it will produce following directory structure:: +For macOS systems it will produce following directory structure:: ExecutableTarget.app/ Contents diff --git a/Help/prop_tgt/SOVERSION.rst b/Help/prop_tgt/SOVERSION.rst index 82b6b976a6..b07c17cfe0 100644 --- a/Help/prop_tgt/SOVERSION.rst +++ b/Help/prop_tgt/SOVERSION.rst @@ -20,7 +20,7 @@ These numbers are used as the image version of the binary. Mach-O Versions ^^^^^^^^^^^^^^^ -For shared libraries and executables on Mach-O systems (e.g. OS X, iOS), +For shared libraries and executables on Mach-O systems (e.g. macOS, iOS), the ``SOVERSION`` property corresponds to *compatibility version* and :prop_tgt:`VERSION` to *current version*. See the :prop_tgt:`FRAMEWORK` target property for an example. Versions of Mach-O binaries may be checked with the diff --git a/Help/prop_tgt/VERSION.rst b/Help/prop_tgt/VERSION.rst index 66e7bde71d..ff3b3030fa 100644 --- a/Help/prop_tgt/VERSION.rst +++ b/Help/prop_tgt/VERSION.rst @@ -22,7 +22,7 @@ These numbers are used as the image version of the binary. Mach-O Versions ^^^^^^^^^^^^^^^ -For shared libraries and executables on Mach-O systems (e.g. OS X, iOS), +For shared libraries and executables on Mach-O systems (e.g. macOS, iOS), the :prop_tgt:`SOVERSION` property correspond to *compatibility version* and ``VERSION`` to *current version*. See the :prop_tgt:`FRAMEWORK` target property for an example. Versions of Mach-O binaries may be checked with the diff --git a/Help/variable/CMAKE_APPBUNDLE_PATH.rst b/Help/variable/CMAKE_APPBUNDLE_PATH.rst index 2bc79ac3a6..c1f0951cc0 100644 --- a/Help/variable/CMAKE_APPBUNDLE_PATH.rst +++ b/Help/variable/CMAKE_APPBUNDLE_PATH.rst @@ -2,5 +2,5 @@ CMAKE_APPBUNDLE_PATH -------------------- :ref:`;-list <CMake Language Lists>` of directories specifying a search path -for OS X application bundles used by the :command:`find_program`, and +for macOS application bundles used by the :command:`find_program`, and :command:`find_package` commands. diff --git a/Help/variable/CMAKE_ENABLE_EXPORTS.rst b/Help/variable/CMAKE_ENABLE_EXPORTS.rst index 9a877e7e6e..7ec4d635de 100644 --- a/Help/variable/CMAKE_ENABLE_EXPORTS.rst +++ b/Help/variable/CMAKE_ENABLE_EXPORTS.rst @@ -12,7 +12,7 @@ dependency on the executable is created for targets that link to it. For DLL platforms an import library will be created for the exported symbols and then used for linking. All Windows-based systems including Cygwin are DLL platforms. For non-DLL platforms that -require all symbols to be resolved at link time, such as OS X, the +require all symbols to be resolved at link time, such as macOS, the module will ``link`` to the executable using a flag like ``-bundle_loader``. For other non-DLL platforms the link rule is simply ignored since the dynamic loader will automatically bind symbols when diff --git a/Help/variable/CMAKE_FIND_APPBUNDLE.rst b/Help/variable/CMAKE_FIND_APPBUNDLE.rst index e0727b547a..7a05facf86 100644 --- a/Help/variable/CMAKE_FIND_APPBUNDLE.rst +++ b/Help/variable/CMAKE_FIND_APPBUNDLE.rst @@ -2,9 +2,9 @@ CMAKE_FIND_APPBUNDLE -------------------- This variable affects how ``find_*`` commands choose between -OS X Application Bundles and unix-style package components. +macOS Application Bundles and unix-style package components. -On Darwin or systems supporting OS X Application Bundles, the +On Darwin or systems supporting macOS Application Bundles, the ``CMAKE_FIND_APPBUNDLE`` variable can be set to empty or one of the following: diff --git a/Help/variable/CMAKE_FIND_FRAMEWORK.rst b/Help/variable/CMAKE_FIND_FRAMEWORK.rst index 790694ac5c..4d5078fb69 100644 --- a/Help/variable/CMAKE_FIND_FRAMEWORK.rst +++ b/Help/variable/CMAKE_FIND_FRAMEWORK.rst @@ -2,9 +2,9 @@ CMAKE_FIND_FRAMEWORK -------------------- This variable affects how ``find_*`` commands choose between -OS X Frameworks and unix-style package components. +macOS Frameworks and unix-style package components. -On Darwin or systems supporting OS X Frameworks, the +On Darwin or systems supporting macOS Frameworks, the ``CMAKE_FIND_FRAMEWORK`` variable can be set to empty or one of the following: diff --git a/Help/variable/CMAKE_FRAMEWORK_PATH.rst b/Help/variable/CMAKE_FRAMEWORK_PATH.rst index 5ff08e6798..04751f88d7 100644 --- a/Help/variable/CMAKE_FRAMEWORK_PATH.rst +++ b/Help/variable/CMAKE_FRAMEWORK_PATH.rst @@ -2,6 +2,6 @@ CMAKE_FRAMEWORK_PATH -------------------- :ref:`;-list <CMake Language Lists>` of directories specifying a search path -for OS X frameworks used by the :command:`find_library`, +for macOS frameworks used by the :command:`find_library`, :command:`find_package`, :command:`find_path`, and :command:`find_file` commands. diff --git a/Help/variable/CMAKE_HOST_APPLE.rst b/Help/variable/CMAKE_HOST_APPLE.rst index ac7b03004f..9c205ec340 100644 --- a/Help/variable/CMAKE_HOST_APPLE.rst +++ b/Help/variable/CMAKE_HOST_APPLE.rst @@ -1,6 +1,6 @@ CMAKE_HOST_APPLE ---------------- -``True`` for Apple OS X operating systems. +``True`` for Apple macOS operating systems. -Set to ``true`` when the host system is Apple OS X. +Set to ``true`` when the host system is Apple macOS. diff --git a/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst b/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst index c67359272d..e8926771c1 100644 --- a/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst +++ b/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst @@ -4,5 +4,5 @@ CMAKE_HOST_SYSTEM_NAME Name of the OS CMake is running on. On systems that have the uname command, this variable is set to the -output of ``uname -s``. ``Linux``, ``Windows``, and ``Darwin`` for OS X +output of ``uname -s``. ``Linux``, ``Windows``, and ``Darwin`` for macOS are the values found on the big three operating systems. diff --git a/Help/variable/CMAKE_INSTALL_NAME_DIR.rst b/Help/variable/CMAKE_INSTALL_NAME_DIR.rst index 1f2d62bf60..5ba4c04cbf 100644 --- a/Help/variable/CMAKE_INSTALL_NAME_DIR.rst +++ b/Help/variable/CMAKE_INSTALL_NAME_DIR.rst @@ -1,7 +1,7 @@ CMAKE_INSTALL_NAME_DIR ---------------------- -OS X directory name for installed targets. +macOS directory name for installed targets. ``CMAKE_INSTALL_NAME_DIR`` is used to initialize the :prop_tgt:`INSTALL_NAME_DIR` property on all targets. See that target diff --git a/Help/variable/CMAKE_MACOSX_RPATH.rst b/Help/variable/CMAKE_MACOSX_RPATH.rst index 042e807f57..2fc648d615 100644 --- a/Help/variable/CMAKE_MACOSX_RPATH.rst +++ b/Help/variable/CMAKE_MACOSX_RPATH.rst @@ -1,7 +1,7 @@ CMAKE_MACOSX_RPATH ------------------- -Whether to use rpaths on OS X and iOS. +Whether to use rpaths on macOS and iOS. This variable is used to initialize the :prop_tgt:`MACOSX_RPATH` property on all targets. diff --git a/Help/variable/CMAKE_OSX_ARCHITECTURES.rst b/Help/variable/CMAKE_OSX_ARCHITECTURES.rst index 51b840d8f7..fdaca28e39 100644 --- a/Help/variable/CMAKE_OSX_ARCHITECTURES.rst +++ b/Help/variable/CMAKE_OSX_ARCHITECTURES.rst @@ -1,7 +1,7 @@ CMAKE_OSX_ARCHITECTURES ----------------------- -Target specific architectures for OS X and iOS. +Target specific architectures for macOS and iOS. This variable is used to initialize the :prop_tgt:`OSX_ARCHITECTURES` property on each target as it is created. See that target property diff --git a/Help/variable/CMAKE_OSX_SYSROOT.rst b/Help/variable/CMAKE_OSX_SYSROOT.rst index f1d58c6b52..db9fccdd1f 100644 --- a/Help/variable/CMAKE_OSX_SYSROOT.rst +++ b/Help/variable/CMAKE_OSX_SYSROOT.rst @@ -1,7 +1,7 @@ CMAKE_OSX_SYSROOT ----------------- -Specify the location or name of the OS X platform SDK to be used. +Specify the location or name of the macOS platform SDK to be used. CMake uses this value to compute the value of the ``-isysroot`` flag or equivalent and to help the ``find_*`` commands locate files in the SDK. diff --git a/Help/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.rst b/Help/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.rst index 3c6687c6ed..666af46153 100644 --- a/Help/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.rst +++ b/Help/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.rst @@ -1,7 +1,7 @@ CMAKE_SYSTEM_APPBUNDLE_PATH --------------------------- -Search path for OS X application bundles used by the :command:`find_program`, +Search path for macOS application bundles used by the :command:`find_program`, and :command:`find_package` commands. By default it contains the standard directories for the current system. It is *not* intended to be modified by the project, use :variable:`CMAKE_APPBUNDLE_PATH` for this. diff --git a/Help/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.rst b/Help/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.rst index 1e8b0d9472..14ba18eff0 100644 --- a/Help/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.rst +++ b/Help/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.rst @@ -1,7 +1,7 @@ CMAKE_SYSTEM_FRAMEWORK_PATH --------------------------- -Search path for OS X frameworks used by the :command:`find_library`, +Search path for macOS frameworks used by the :command:`find_library`, :command:`find_package`, :command:`find_path`, and :command:`find_file` commands. By default it contains the standard directories for the current system. It is *not* intended to be modified by the project, diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index cdc38a6a9c..f3e34233a1 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 6c122e5660..a0d99354d6 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/ProcessorCount.cmake b/Modules/ProcessorCount.cmake index 772a6150e4..8a37884b7c 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 |