diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-18 14:20:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-18 14:20:16 (GMT) |
| commit | 0923246b2e2fb5be0d2fa1b256879a326aeee13b (patch) | |
| tree | 4b2b6e0b8f5a4ad2178893b5586684354351aaee /Help | |
| parent | bafd0ffa987bea9216e7722c027478f26d5e8f6a (diff) | |
| parent | afb325018ebe7c41933b652732a43e4bb4777588 (diff) | |
| download | CMake-0923246b2e2fb5be0d2fa1b256879a326aeee13b.zip CMake-0923246b2e2fb5be0d2fa1b256879a326aeee13b.tar.gz CMake-0923246b2e2fb5be0d2fa1b256879a326aeee13b.tar.bz2 | |
Merge topic 'require-xcode-5'
afb325018e Xcode: Require at least Xcode 5
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2975
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/generator/Xcode.rst | 4 | ||||
| -rw-r--r-- | Help/release/dev/require-xcode-5.rst | 4 | ||||
| -rw-r--r-- | Help/variable/CMAKE_MAKE_PROGRAM.rst | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/Help/generator/Xcode.rst b/Help/generator/Xcode.rst index 71430c7..d893ac5 100644 --- a/Help/generator/Xcode.rst +++ b/Help/generator/Xcode.rst @@ -3,9 +3,7 @@ Xcode Generate Xcode project files. -This supports Xcode 3.0 and above. Support for Xcode versions prior -to Xcode 5 is deprecated and will be dropped in a future version of -CMake. +This supports Xcode 5.0 and above. Toolset Selection ^^^^^^^^^^^^^^^^^ diff --git a/Help/release/dev/require-xcode-5.rst b/Help/release/dev/require-xcode-5.rst new file mode 100644 index 0000000..6cfe96a --- /dev/null +++ b/Help/release/dev/require-xcode-5.rst @@ -0,0 +1,4 @@ +require-xcode-5 +--------------- + +* The :generator:`Xcode` generator now requires at least Xcode 5. diff --git a/Help/variable/CMAKE_MAKE_PROGRAM.rst b/Help/variable/CMAKE_MAKE_PROGRAM.rst index 4f5a50f..56df2df 100644 --- a/Help/variable/CMAKE_MAKE_PROGRAM.rst +++ b/Help/variable/CMAKE_MAKE_PROGRAM.rst @@ -19,15 +19,11 @@ to configure the project: This generator stores ``CMAKE_MAKE_PROGRAM`` in the CMake cache so that it may be edited by the user. -* The :generator:`Xcode` generator sets this to ``xcodebuild`` (or possibly an - otherwise undocumented ``cmakexbuild`` wrapper implementing some - workarounds). +* The :generator:`Xcode` generator sets this to ``xcodebuild``. This generator prefers to lookup the build tool at build time rather than to store ``CMAKE_MAKE_PROGRAM`` in the CMake cache - ahead of time. This is because ``xcodebuild`` is easy to find, - the ``cmakexbuild`` wrapper is needed only for older Xcode versions, - and the path to ``cmakexbuild`` may be outdated if CMake itself moves. + ahead of time. This is because ``xcodebuild`` is easy to find. For compatibility with versions of CMake prior to 3.2, if a user or project explicitly adds ``CMAKE_MAKE_PROGRAM`` to |