mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
51,887 Commits 2 Branches 385 Tags
c8ff06a1f8a31782ca314072fa0f98f953f97305
Commit Graph

5003 Commits

Author SHA1 Message Date
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
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
Brad King
2c2eb777f4 Merge topic 'build-test-presets' 
9b5289ebd8 Help: Add release note for build and test presets
c8a5cd6871 Tests: Update RunCMake/CMakePresets --list-presets
69a5cf23a2 Tests: Update RunCMake/CommandLine BuildDir
b500935b94 Tests: Add test preset tests
74a86566f0 Tests: Add build preset tests
56751c83aa Tests: Factor out RunCMake.CMakePresets schema validation
676ecf0d37 cmake-presets: Add build and test presets
4f4f2028b8 Help: Add documentation for buildPresets and testPresets
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5681
 2021-02-05 06:57:28 -05:00
Brad King
07ca40408a Merge topic 'doc-find-env-vars' 
c40e81ce80 Help: Restore docs that find_library considers LIB, not INCLUDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5772
 2021-02-05 06:55:37 -05:00
Craig Scott
17e5516e60 FetchContent: Invoke steps directly and avoid a separate sub-build 
The cost of setting up and executing a separate sub-build to do the
download, update and patch steps required for FetchContent population
can be significant with some platforms and CMake generators. Avoid the
sub-build altogether by invoking the step scripts directly.

Previously, if no generator was set (e.g. population was being done in
script mode), a generator needed to be available on the default PATH.
Since we no longer use a sub-build, this restriction is also now gone.

Fixes: #21703
 2021-02-05 07:33:38 +11:00
Craig Scott
4f3d1abbb4 ExternalProject: Refactor pre-configure steps to support no-target uses 
The mkdir, download, update and patch steps are used by
FetchContent during the configure phase of the main build. Because
these steps need a target, this has so far required a sub-build to be
set up. The changes here factor out the preparation of the scripts
from the creation of the targets, allowing future work to leverage these
steps without a sub-build (see #21703).

As part of the refactoring, some rationalisation of the stamp files,
repository info files and script names was done to make things more
consistent between download methods and step implementations.
Every download method now records its own specific repository info
in a file and that file is a dependency of the download step. The source
directory is also written to that file, so if the SOURCE_DIR changes, the
download will be retriggered (the existing implementation fails in this
scenario). Each download method now also has just one driver script
that implements the whole step (it may pull in other scripts to do its
task though). The patch step gained support for USES_TERMINAL as
a result of generalising the implementation for custom commands.

Fixes: #21748
 2021-02-05 07:33:38 +11:00
Brad King
9b5289ebd8 Help: Add release note for build and test presets 2021-02-04 11:39:55 -05:00
Brad King
c40e81ce80 Help: Restore docs that find_library considers LIB, not INCLUDE 
Documentation updates in commit 02f527c66a (Find: Provide global
controls for the `NO_[]_PATH` call options, 2019-06-12,
v3.16.0-rc1~541^2) accidentally switched the `find_library`
documentation to mention `INCLUDE` where it should be `LIB`.

While at it, update `find_file` and `find_path` to mention
`INCLUDE` and `PATH` in the order they are considered.
 2021-02-04 09:09:25 -05:00
Brad King
67cb006732 Merge topic 'aix-xcoff-edit' 
e017ba046c AIX: Enable XCOFF editing to replace RPATH on installation
56fc4a325f cmXCOFF: Add helper to parse and edit the XCOFF binary format
ddaaee907d CMakeDetermineCompilerId: Recognize XCOFF executable format
69e1d95a8a Tests: Add sample XCOFF binaries
f79d991dfd Tests: Convert CMake.ELF to RunCMake.file-RPATH ELF case
d8f3e68ca9 Ninja Multi-Config: Enable relink diagnostic message
cdcfe3eb99 Rename CMAKE_USE_MACH_PARSER to CMake_USE_MACH_PARSER
b6071c93f5 Rename CMAKE_USE_ELF_PARSER to CMake_USE_ELF_PARSER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5769
 2021-02-04 08:29:57 -05:00
Brad King
4cd23c5e0d Merge topic 'issue-17634' 
5af38a11ce try_run: Allow to set working directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5757
 2021-02-04 08:22:19 -05:00
Brad King
e017ba046c AIX: Enable XCOFF editing to replace RPATH on installation 
Avoid relinking before installation.
 2021-02-03 12:26:58 -05:00
Brad King
c28dbd7e30 Merge topic 'intel-llvm-compilers' 
a552487843 Help: Clarify release note for IntelLLVM compiler support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5758
 2021-02-03 11:11:25 -05:00
Asit Dhal
5af38a11ce try_run: Allow to set working directory 
Fixes: #17634
 2021-02-03 08:42:05 +01:00
Brad King
a552487843 Help: Clarify release note for IntelLLVM compiler support 
Update the release note added by commit b9f945eccb (Help: Add release
note for IntelLLVM compiler support, 2021-01-29) to distinguish between
the Intel oneAPI NextGen and Classic compilers.

Co-Author: William R. Dieter <william.r.dieter@intel.com>
Suggested-by: Michael Hirsch, Ph.D <michael@scivision.dev>
 2021-02-02 13:30:09 -05:00
Brad King
8387aa20f2 Merge topic 'issue-19198' 
255df8622b file(GENERATE): Support new line style

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5649
 2021-02-02 08:53:07 -05:00
Brad King
193cba5d92 Merge topic 'doc-user-interaction-ClangCL' 
c16509907c Help: Update to VS ClangCL toolset in user-interaction example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5756
 2021-02-02 08:50:30 -05:00
Brad King
7b38688e22 Merge topic 'fix21727_for_FindOpenSSL' 
bc00cf9300 FindOpenSSL: Add support for version-range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5750
 2021-02-02 08:49:44 -05:00