mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-26 00:20:06 -06:00
Code Issues Packages Projects Releases Wiki Activity
51,971 Commits 2 Branches 386 Tags
ef3d1ebda874a338a8d78c2a31d3d94c4ba4ea40
Commit Graph

5018 Commits

Author SHA1 Message Date
Brad King
ef3d1ebda8 Merge topic 'android-r22' into release-3.20 
005e2cdfb0 Android: Do not use gold for ndk >= r22
ed7a87f270 Tests: Update RunCMake.Android for NDK r22
4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable
746906242d Android: Detect NDK version number

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5862
 2021-03-03 11:11:58 -05:00
Brad King
4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable 2021-03-03 10:27:50 -05:00
Ben Boeckel
74c2ade187 Help/guide: fix the remaining CMake install destinations 
Followup from !5674.
 2021-03-01 11:05:14 -05:00
Robert Maynard
6bfb2c6175 HELP: Update compile-features documentation with missing compilers 2021-02-24 13:09:59 -05:00
Brad King
e95f7aa0ed Merge topic 'preset-flag-consistency' into release-3.20 
6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument
3357d37761 cmake: Add support for '--build --prefix=<prefix>' form of the argument
2f13fdef0a cmake: Document '--preset <preset>' form of the argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5849
 2021-02-24 09:46:52 -05:00
Brad King
261ba00668 Merge topic 'autogen-cmp0116-fix' into release-3.20 
339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation
e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN
cf34011ce7 Tests: Test per-CC behavior of CMP0116
3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation
f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5848
 2021-02-24 09:44:59 -05:00
Brad King
06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments 2021-02-24 09:33:59 -05:00
Kyle Edwards
4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)" 
Revert commit 8f1e607ed9 (Help: Document JSON comment support in
cmake-presets(7), 2021-02-18).  The support for comments was a mistake
when the feature was implemented in 3.19, and is being removed.
 2021-02-24 09:33:50 -05:00
Kyle Edwards
431dd59b5e CMakePresets.json: Remove undocumented support for comments 
Fixes: #21858
 2021-02-24 09:28:36 -05:00
Brad King
6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument 
The main `cmake --preset` argument for configure presets supports both
forms, so support it for `ctest --preset` too.

Fixes: #21855
 2021-02-23 09:22:00 -05:00
Kyle Edwards
339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation 2021-02-23 09:17:12 -05:00
Brad King
3357d37761 cmake: Add support for '--build --prefix=<prefix>' form of the argument 
The main `cmake --preset` argument for configure presets supports both
forms, so support it for `cmake --build --preset` too.

Issue: #21855
 2021-02-23 09:11:44 -05:00
Brad King
2f13fdef0a cmake: Document '--preset <preset>' form of the argument 
This form already works.  Document it and add tests.

Issue: #21855
 2021-02-23 09:11:32 -05:00
Brad King
b2b73ff713 Merge topic 'doc-cpack-dpkg-shlibdeps-l' into release-3.20 
cf9a71870b Help: Fix CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5835
 2021-02-22 10:38:00 -05:00
Brad King
c8ff06a1f8 Merge topic 'docpreset' into release-3.20 
87b170d9f9 Help: Add build and test preset to examples in cmake-presets(7)
3f8cf006cb Help: Clarify preset name conflict rules in cmake-presets(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5823
 2021-02-19 09:34:35 -05:00
Brad King
cf9a71870b Help: Fix CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS documentation 
The docs added by commit d586a4ad60 (CPackDeb: dpkg-shlibdeps now
supports searching for private shared libs, 2021-01-19,
v3.20.0-rc1~115^2) specify the `-d` option, but the implementation
actually uses the `-l` option.

Issue: #21838
 2021-02-19 09:14:14 -05:00
Brad King
0ee997b132 Merge topic 'doc-if-links' into release-3.20 
22140f7af3 Help: Add internal links to if() docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5824
 2021-02-18 15:12:30 -05:00
Michael Hirsch
87b170d9f9 Help: Add build and test preset to examples in cmake-presets(7) 
Co-Author: Brad King <brad.king@kitware.com>
 2021-02-18 14:53:28 -05:00
Michael Hirsch
3f8cf006cb Help: Clarify preset name conflict rules in cmake-presets(7) 2021-02-18 14:53:28 -05:00
Brad King
98ae005137 Merge topic 'preset-json-comments' into release-3.20 
8f1e607ed9 Help: Document JSON comment support in cmake-presets(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5830
 2021-02-18 14:52:26 -05:00
Michael Hirsch
8f1e607ed9 Help: Document JSON comment support in cmake-presets(7) 2021-02-18 11:47:40 -05:00
Brad King
47ab2d4d2e Help: Clarify role of binaryDir inheritance in cmake-presets(7) 
Suggested-by: Michael Hirsch
 2021-02-18 11:01:29 -05:00
Brad King
0e3c361f77 Help: Link to tool-specific preset arguments from cmake-presets(7) 
Fixes: #21835
 2021-02-18 10:55:10 -05:00
Brad King
dd6165fbd4 Help: Mention version 2 in cmake-presets(7) 
Version 2 is required for build and test presets.

Fixes: #21829
 2021-02-18 10:55:10 -05:00
Michael Hirsch, Ph.D
22140f7af3 Help: Add internal links to if() docs 2021-02-18 10:20:34 -05:00
Sam Freed
7fd6bb6895 presets: Remove unintended rerunFailed option from test presets 
This was accidentally included after discussion in #21391 had decided to
leave it out.  It was never included in a release.

Issue: #21391
 2021-02-15 10:52:32 -05:00
Brad King
7f2203ab4a Merge topic 'release-3.20-cleanups' into release-3.20 
7c147b21c7 Help: Add Ninja Multi-Config and make generator types into links
5039ca1126 Help: Convert output directory variable mentions to cross-references
1a7e51b9d5 Help: Cleanup wording and links in 3.20 release notes
d16830324f CPackIFW: Improve warning and docs for show page list option
7ed7db88a4 CPackIFW: Fix cppcheck warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5810
 2021-02-15 10:32:20 -05:00
Brad King
26eae560ff Merge topic 'FindGDAL-improvements' into release-3.20 
55e493928b FindGDAL: add release note
f4b53fadda FindGDAL: support finding additional GDAL library names
1b2774450d FindGDAL: add support for skipping gdal-config
1621cb3eb1 FindGDAL: add documentation to cache variables
3caaff4c08 FindGDAL: conditionally set the output variables
3f6a4f2062 FindGDAL: mark cache variables as advanced
02e906305d FindGDAL: use execute_process instead of exec_program
140344da14 FindGDAL: fix some indentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5799
 2021-02-15 10:21:18 -05:00
Brad King
e0d9d6c06b Merge topic 'relnote-IOS_INSTALL_COMBINED-xcode12' into release-3.20 
cd80f3905f Help: Add 3.19.5 release notes for Xcode iOS-related changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5811
 2021-02-15 10:12:48 -05:00
Craig Scott
cd80f3905f Help: Add 3.19.5 release notes for Xcode iOS-related changes 2021-02-14 18:28:56 +11:00
Craig Scott
7c147b21c7 Help: Add Ninja Multi-Config and make generator types into links 2021-02-14 15:41:49 +11:00
Craig Scott
5039ca1126 Help: Convert output directory variable mentions to cross-references 2021-02-14 15:39:29 +11:00
Craig Scott
1a7e51b9d5 Help: Cleanup wording and links in 3.20 release notes 2021-02-14 15:37:55 +11:00
Craig Scott
d16830324f CPackIFW: Improve warning and docs for show page list option 2021-02-14 15:33:45 +11:00
Ben Boeckel
55e493928b FindGDAL: add release note 2021-02-12 07:43:23 -05:00
Brad King
36b0cc7958 Merge topic 'Help-MSVC_IDE-avail-notice' into release-3.20 
cf22237c69 Help: clarify availability of the MSVC_IDE variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5800
 2021-02-12 06:54:35 -05:00
Felipe Torrezan
8ee933900e IAR: add support for the STM8 compiler 2021-02-12 06:51:05 -05:00
Ben Boeckel
cf22237c69 Help: clarify availability of the MSVC_IDE variable 2021-02-11 09:43:21 -05:00
Brad King
fc901bc91d Help: Drop development topic notes to prepare release 
Release versions do not have the development topic section of
the CMake Release Notes index page.
 2021-02-10 08:25:37 -05:00
Brad King
a30d096c85 Help: Update Sphinx versionadded directives for 3.20 release 
Run the script:

    Utilities/Sphinx/update_versions.py --since v3.19.0 --overwrite

Manually restore the 3.20 version for `cmake_path`, which was originally
part of 3.19 but reverted and restored in 3.20.
 2021-02-10 08:18:12 -05:00
Brad King
704878e3ad Help: Organize and revise 3.20 release notes 
Add section headers similar to the 3.19 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
 2021-02-10 08:17:45 -05:00
Brad King
4911636728 Help: Consolidate 3.20 release notes 
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.20.rst`.
 2021-02-10 08:16:42 -05:00
John Melas
90467747a1 FindBoost: Add option to suppress new boost version dependency warning 
Add option `Boost_NO_WARN_NEW_VERSIONS` to suppress new boost version
dependency warning.

Fixes: #21786
 2021-02-10 08:02:24 -05:00
Brad King
40f4147224 Merge topic 'object-lib-multiarch' 
4d46b1401f add_library(): Allow imported object libraries with multi-arch
1a915e8953 Tests: TargetObjects does not need any languages enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5771
 2021-02-09 08:22:06 -05:00
Brad King
18fa819e26 Merge topic '21479-branding-name-cpack-nsis' 
0aabeb0c30 CPack/NSIS: Add option for setting branding text

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5784
 2021-02-09 08:20:17 -05:00
Brad King
9cddaad940 AddFileDependencies: Deprecate this unnecessary module 
Document that one can call `set_property` directly instead.
 2021-02-08 12:44:37 -05:00
Johnny Jazeix
0aabeb0c30 CPack/NSIS: Add option for setting branding text 
See https://nsis.sourceforge.io/Reference/BrandingText
for more information.

Fixes: #21479
 2021-02-07 16:10:57 +01:00
Craig Scott
4d46b1401f add_library(): Allow imported object libraries with multi-arch 
Fixes: #21276
 2021-02-06 11:34:28 +11:00
Brad King
5dd356cefc Help: Convert some genex names to explicit cross-references 
Since commit c2dc7e0f53 (Help: Convert genex documentation to sphinx
domain objects, 2021-01-15) we can use `:genex:` cross-references to
link to named generator expressions.  Update some places to do this.

This is meant to demonstrate the capability, not as a comprehensive
sweep.
 2021-02-05 16:05:25 -05:00
Brad King
acb33d0904 Merge topic 'fetchcontent-performance' 
17e5516e60 FetchContent: Invoke steps directly and avoid a separate sub-build
4f3d1abbb4 ExternalProject: Refactor pre-configure steps to support no-target uses
23aab9ecce ExternalProject: Avoid scanning docs for keywords, use include_guard()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Acked-by: Lars Melchior <lars.melchior@gmail.com>
Merge-request: !5749
 2021-02-05 07:01:05 -05:00