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
52,113 Commits 2 Branches 385 Tags
9f81591dbf5d8840f7193bb01ac0921fd5b2b687
Commit Graph

5041 Commits

Author SHA1 Message Date
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
Brad King
a5678e46f8 Merge topic 'runtime-dll-deps' 
f31e8d33ef Genex: Fix grammatical error in TARGET_OBJECTS error message
d34d28e688 Genex: Add TARGET_RUNTIME_DLLS genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5837
 2021-02-25 09:58:40 -05:00
Brad King
6288974ba5 Merge topic 'nvhpc-minor-fixes' 
72efd95add PGI: Explicitly specify CMAKE_CXX98_STANDARD_COMPILE_OPTION
6bfb2c6175 HELP: Update compile-features documentation with missing compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5857
 2021-02-25 09:02:02 -05:00
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
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
414cfc6ecb Merge topic 'preset-flag-consistency' 
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
ab3485d15b Merge topic 'autogen-cmp0116-fix' 
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
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
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
ec5f76753a Merge topic 'cpack_nsis_executable_custom' 
8e8b99d01a CPack/NSIS: Add option for setting custom makensis executable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5839
 2021-02-23 08:11:05 -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
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
1fa9dc3578 Merge topic 'doc-cpack-dpkg-shlibdeps-l' 
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
b3e39a133f Merge topic 'list-index-arg-parsing' 
79eaa908dc cmListCommand: add a policy for failing on invalid indicies
1f1fdff7fa cmListCommand: prefer strtol to atoi
9934a97642 cmListCommand: refactor out index argument parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !5817
 2021-02-19 09:40:28 -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
3412d95bf7 Merge topic 'docpreset' 
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
bc94ff7945 Merge topic 'doc-if-links' 
22140f7af3 Help: Add internal links to if() docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5824
 2021-02-18 15:12:31 -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
Brad King
b8e4e524d3 Merge topic 'preset-json-comments' 
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
Brad King
91b4c27d8a Merge topic 'doc-presets' 
47ab2d4d2e Help: Clarify role of binaryDir inheritance in cmake-presets(7)
0e3c361f77 Help: Link to tool-specific preset arguments from cmake-presets(7)
dd6165fbd4 Help: Mention version 2 in cmake-presets(7)
cdbd1ae64b Utilities/Sphinx: Avoid converting -- to an en-dash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5829
 2021-02-18 14:35:36 -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
Ben Boeckel
79eaa908dc cmListCommand: add a policy for failing on invalid indicies 2021-02-18 08:30:55 -05:00
Brad King
4388c3f717 Merge topic 'DOC-SelectLibraryConfiguration' 
b6445ddeda Help: Add SelectLibraryConfigurations example to cmake-developer(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !5815
 2021-02-18 08:21:50 -05:00
Johan Andruejol
b6445ddeda Help: Add SelectLibraryConfigurations example to cmake-developer(7) 2021-02-17 14:27:52 -05:00
Brad King
c86ac240ff Merge topic 'preset-fixes' 
121d602923 presets: Inherit 'quiet' property for test presets
7fd6bb6895 presets: Remove unintended rerunFailed option from test presets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5808
 2021-02-16 10:42:28 -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
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