mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-16 03:32:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
52,326 Commits 2 Branches 385 Tags
415ead81533ead72fca8a495c3cbc17e2bf4e400
Commit Graph

2424 Commits

Author SHA1 Message Date
Kyle Edwards
0d497e159b CMakePresets.json: Add ${hostSystemName} macro 2021-03-15 14:41:42 -04:00
Kyle Edwards
ad19da011d Refactor: Add cmSystemTools::GetSystemName() 
And use it for CMAKE_HOST_SYSTEM_NAME and CMAKE_SYSTEM_NAME.
 2021-03-15 14:41:42 -04:00
Brad King
3d661c6c3a Merge topic 'vs-toolset-version' 
30c835428f VS: Accept and translate '-T version=' values with three components
58a50a3a0a VS: Fix '-T version=14.28' under VS 16.9
09f59da7f0 cmGlobalVisualStudioVersionedGenerator: Clarify local variable name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5903
 2021-03-15 08:50:13 -04:00
Brad King
30c835428f VS: Accept and translate '-T version=' values with three components 
The VS 16.8 and VS 16.9 toolset versions differ only in their third
component.  The `vcvarsall` option `-vcvars_ver=` accepts a three
component version, so accept this format for VS toolset selection too.

Issue: #21922
 2021-03-12 08:36:45 -05:00
Brad King
9a80ce6d24 Merge topic 'add_prefix_cmake_option' 
400536c317 cmCommandLineArgument: trim leading empty spaces
b227a9565e cmake: configure preset add support for --install-prefix mapping
38140713ad cmake: add support for --install-prefix command argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5843
 2021-03-11 08:16:03 -05:00
Brad King
00eb4df37e Merge topic 'file-COPY_FILE-subcommand' 
088444211e file: add `COPY_FILE` subcommand
100016e9cb cmSystemTools: add utilities to copy a file with error handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5885
 2021-03-11 08:13:29 -05:00
Brad King
03193a9e9a Merge topic 'ep-fc-revert-refactoring' 
57d442e182 Revert ExternalProject and FetchContent refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5898
 2021-03-10 11:37:15 -05:00
Ben Boeckel
088444211e file: add COPY_FILE subcommand 
The `file(COPY)` subcommand is overloaded and busy for such a simple
operation. Instead, make a simpler subcommand with error handling
support.
 2021-03-10 10:43:18 -05:00
Craig Scott
57d442e182 Revert ExternalProject and FetchContent refactoring 
Refactoring of the ExternalProject and FetchContent modules moved
the commands into CMake scripts. This broke custom commands that
used shell redirection or special build tool variables of the form
$(MakeVar). Undo the sequence of commits that performed this
refactoring and follow-up fixes associated with it.

The following commits are reverted by this change:

4f3d1abbb4 (ExternalProject: Refactor pre-configure steps to support
no-target uses, 2021-02-05)

17e5516e60 (FetchContent: Invoke steps directly and avoid a separate
sub-build, 2021-01-29)

bd876f3849 (FetchContent: Restore patch command support,
2021-02-18)

404cddb7bb (ExternalProject: Fix misuse of IS_NEWER_THAN in
timestamp checks, 2021-02-21)

b0da671243 (FetchContent: Don't update timestamps if files don't
change, 2021-02-18)

Fixes: #21892
 2021-03-10 09:07:44 +11:00
Robert Maynard
b227a9565e cmake: configure preset add support for --install-prefix mapping 2021-03-09 13:53:16 -05:00
Robert Maynard
38140713ad cmake: add support for --install-prefix command argument 
Fixes: #21781
 2021-03-04 10:50:24 -05:00
Brad King
9bf40d8027 file(RENAME): Add option to not replace existing path 
Add a `NO_REPLACE` option that prevents overwriting `<newname>`
if it exists.
 2021-03-04 08:49:48 -05:00
Brad King
c61292726c file(RENAME): Add option to capture error message on failure 2021-03-04 08:44:06 -05:00
Brad King
957a117c70 Merge topic 'android-r22' 
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
Kevin Ushey
e3ac388738 cpack: add CPACK_DMG_FILESYSTEM 
Allow users to configure the filesystem format of the generated `.dmg`
via the `CPACK_DMG_FILESYSTEM` option.

Fixes: #21874
 2021-03-02 10:11:15 -05:00
Brad King
7a10aa922d Merge topic 'FindIntl-FindIconv-versions' 
a9b11a06f5 FindIntl: Add version support
01e9922db5 FindIconv: Add version support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5852
 2021-03-01 14:55:10 -05:00
Raul Tambre
dcd599757f C23 support 2021-02-25 18:22:10 +02:00
Raul Tambre
93b7d3d292 C17 support 
Implements #17755.
 2021-02-25 18:22:10 +02:00
Sibi Siddharthan
a9b11a06f5 FindIntl: Add version support 
Additional Changes: Rework the documentation of FindIntl

NOTES:
Reorder the REQUIRED_VARS arguments so find_package reports the library
instead of the include directory.
Handle Intl_LIBRARY in the same way how FindIconv handles it in case of glibc.
If the VERSION_VAR argument is an empty string nothing happens.

Fixes: #21857
 2021-02-25 20:18:56 +05:30
Sibi Siddharthan
01e9922db5 FindIconv: Add version support 
Issue: #21857
 2021-02-25 20:18:55 +05:30
Kyle Edwards
d34d28e688 Genex: Add TARGET_RUNTIME_DLLS genex 
Co-Authored-by: Brad King <brad.king@kitware.com>
 2021-02-24 14:55:17 -05:00
Brad King
bf0fd71ad1 Merge topic 'preset-no-comments' 
06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments
afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in
4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)"
431dd59b5e CMakePresets.json: Remove undocumented support for comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5853
 2021-02-24 09:42:00 -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
431dd59b5e CMakePresets.json: Remove undocumented support for comments 
Fixes: #21858
 2021-02-24 09:28:36 -05:00
Johnny Jazeix
8e8b99d01a CPack/NSIS: Add option for setting custom makensis executable 
It allows users to set a custom one without changing the PATH environment variable.

Fixes: #21733
 2021-02-22 17:59:04 +01:00
Ben Boeckel
79eaa908dc cmListCommand: add a policy for failing on invalid indicies 2021-02-18 08:30:55 -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
a962249f7c Merge topic 'release-3.20-cleanups' 
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
58a2f5d029 Merge topic 'FindGDAL-improvements' 
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
Brad King
65b4ae2394 Merge topic 'relnote-IOS_INSTALL_COMBINED-xcode12' 
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
1a7e51b9d5 Help: Cleanup wording and links in 3.20 release notes 2021-02-14 15:37:55 +11:00
Ben Boeckel
55e493928b FindGDAL: add release note 2021-02-12 07:43:23 -05:00
Brad King
c9eebb75ac Merge topic 'iar-stm8-compiler-support' 
8ee933900e IAR: add support for the STM8 compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5796
 2021-02-12 06:52:27 -05:00
Felipe Torrezan
8ee933900e IAR: add support for the STM8 compiler 2021-02-12 06:51:05 -05:00
Brad King
693f4c70ff Begin post-3.20 development 2021-02-10 08:29:46 -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
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
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