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 /Help/prop_tgt/IMPORTED_LOCATION.rst | |
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 'Help/prop_tgt/IMPORTED_LOCATION.rst')
-rw-r--r-- | Help/prop_tgt/IMPORTED_LOCATION.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Help/prop_tgt/IMPORTED_LOCATION.rst b/Help/prop_tgt/IMPORTED_LOCATION.rst index 8cfef73..2d07aad 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 |