Commit Graph

30363 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 c06a6ba61a Merge topic 'create-test-source-list-duplicate-decls'
136608dfec cmCreateTestSourceList: avoid generating duplicate declarations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5856
2021-02-25 09:04:20 -05:00
Kitware Robot 12cc87281f CMake Nightly Date Stamp 2021-02-25 00:01:15 -05:00
Kyle Edwards f31e8d33ef Genex: Fix grammatical error in TARGET_OBJECTS error message 2021-02-24 14:55:17 -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
Ben Boeckel 136608dfec cmCreateTestSourceList: avoid generating duplicate declarations
This avoids warnings with `clang-tidy`'s
`-readability-redundant-declaration` lint in generated source code.
2021-02-24 13:33:28 -05:00
Brad King b4a103bdec Merge topic 'autouic-headers-ninja'
1265c65b33 AUTOUIC: Collect ui header files for Ninja generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5803
2021-02-24 09:49:03 -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 d4ce3d65f3 Merge topic 'LINK_LANGUAGE-genex-respects-LINKER_LANGUAGE-property'
b722eea925 Genex: LINK_LANGUAGE respects LINKER_LANGUAGE property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5841
2021-02-24 09:45:51 -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 431dd59b5e CMakePresets.json: Remove undocumented support for comments
Fixes: #21858
2021-02-24 09:28:36 -05:00
Kitware Robot ca4a615118 CMake Nightly Date Stamp 2021-02-24 00:01:13 -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 3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation 2021-02-23 09:14:31 -05:00
Kyle Edwards f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation 2021-02-23 09:14:31 -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
Marc Chevrier b722eea925 Genex: LINK_LANGUAGE respects LINKER_LANGUAGE property
If target property LINKER_LANGUAGE is set, LINK_LANGUAGE generator
expression evaluation must be always successful.

This fix can be helpful to elaborate a solution for issue #21818.
2021-02-23 08:14:14 -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
Brad King 8362915b9d Merge topic 'cmake-gui-restore-search' into release-3.20
134d69121e cmake-gui: Restore search bar for cache view and environment dialog

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5845
2021-02-23 08:07:31 -05:00
Brad King 833299356b Merge topic 'cmake-gui-restore-search'
134d69121e cmake-gui: Restore search bar for cache view and environment dialog

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5845
2021-02-23 08:07:31 -05:00
Brad King 049c257e1d Merge topic 'per-config-autogen-info-file' into release-3.20
a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5840
2021-02-23 08:00:12 -05:00
Brad King 4052aa41c5 Merge topic 'per-config-autogen-info-file'
a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5840
2021-02-23 08:00:12 -05:00
Alexey Edelev 1265c65b33 AUTOUIC: Collect ui header files for Ninja generator
The '<user target>_autogen/timestamp' target supposed to
generate ui header files using the 'uic'. Ninja must have
information about these header files as a result of generating.

The fix collects .ui files of the user target and generates
a list of the ui headers that need to be added to the generating
results of the '<user target>_autogen/timestamp' target.

The case when the .ui files are not specified and collected by
AUTOUIC from the include directives of the project source files
is not covered in this patch.

Fixes: #16776
2021-02-23 13:46:40 +01:00
Kitware Robot bdf6a71c56 CMake Nightly Date Stamp 2021-02-23 00:01:18 -05:00
Sankhesh Jhaveri 134d69121e cmake-gui: Restore search bar for cache view and environment dialog
This was broken by commit f1de6f6682 (cmake-gui: Support building
against Qt6, 2020-12-17, v3.20.0-rc1~205^2~7).

Fixes: #21850
2021-02-22 17:56:59 -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
Craig Scott 28501fca94 PCH PDB: Fix misuse of IS_NEWER_THAN in timestamp check
When using a file system which only has second resolution timestamps,
there is a reasonably high likelihood of timestamps being the same.
The IS_NEWER_THAN test returns true when timestamps are the same,
so don't retry copying the PCH PDB file when they match exactly.
2021-02-22 11:02:38 -05:00
Brad King c6feaa502e Merge topic 'vs-pch-one-lang'
9945b3b565 VS: Restore support for PCH in CXX but not C within once target
d9fd32b3b3 cmVisualStudio10TargetGenerator: Refactor per-source PCH logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5836
2021-02-22 10:40:29 -05:00
Brad King 33d93089ef Merge topic 'vs-pch-one-lang' into release-3.20
9945b3b565 VS: Restore support for PCH in CXX but not C within once target
d9fd32b3b3 cmVisualStudio10TargetGenerator: Refactor per-source PCH logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5836
2021-02-22 10:40:28 -05:00
Brad King 48797098fe Merge topic 'cpackifw-scanbuild-fix' into release-3.20
90c2f138ee CPackIFWInstaller: Avoid potential null pointer dereference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5832
2021-02-22 10:39:30 -05:00
Brad King db4a4b9e7a Merge topic 'cpackifw-scanbuild-fix'
90c2f138ee CPackIFWInstaller: Avoid potential null pointer dereference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5832
2021-02-22 10:39:30 -05:00
Craig Scott a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json
Qt6 reads our internal AutogenInfo.json file. In 92d7b456e5
(Autogen: Add support for per-config sources, 2020-10-20), the
ordering of the HEADERS array elements was changed and this
broke their cmake_automoc_parser. We don't need to change the
order of the array elements, we can append to the existing ones
instead. Do this to allow their cmake_automoc_parser to continue
to work.

Fixes: #21823
2021-02-22 16:11:26 +11:00
Kitware Robot 9e1fe1f358 CMake Nightly Date Stamp 2021-02-22 00:02:13 -05:00
Kitware Robot 7aad4df2ff CMake Nightly Date Stamp 2021-02-21 00:01:08 -05:00
Kitware Robot 894e5548a8 CMake Nightly Date Stamp 2021-02-20 00:01:14 -05:00
Brad King 9945b3b565 VS: Restore support for PCH in CXX but not C within once target
Fix logic from commit 9df1f33c9a (VisualStudio: move PCH rules to
projects when possible., 2020-10-15, v3.20.0-rc1~638^2) to explicitly
disable PCH on sources that should not use the target-wide PCH rules.

Fixes: #21827
2021-02-19 11:25:29 -05:00
Brad King d9fd32b3b3 cmVisualStudio10TargetGenerator: Refactor per-source PCH logic
De-duplicate the link language lookup.
2021-02-19 11:25:03 -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 fe727ee2f9 Merge topic 'llvm-nm-cleanup'
06e5077688 bindexplib: remove stray debugging output when using llvm-nm

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5828
2021-02-19 09:33:32 -05:00
Craig Scott 90c2f138ee CPackIFWInstaller: Avoid potential null pointer dereference
In d16830324f (CPackIFW: Improve warning and docs for show page list
option, 2021-02-14), code was added to report the current QtIFW version.
That code didn't check that there was a Generator object before using it,
resulting in a scanbuild warning about a potential null pointer dereference.
Add a check and output a more general warning message if we don't have
the current QtIFW version available to report.
2021-02-19 17:11:53 +11:00
Kitware Robot 772c32831f CMake Nightly Date Stamp 2021-02-19 00:01:14 -05:00
Brad King 06e5077688 bindexplib: remove stray debugging output when using llvm-nm
Remove a debugging message left by commit c856d4556b (bindexplib:
supporting llvm bitcode formats using llvm-nm, 2019-08-13,
v3.16.0-rc1~161^2~1).
2021-02-18 09:37:21 -05:00
Ben Boeckel 79eaa908dc cmListCommand: add a policy for failing on invalid indicies 2021-02-18 08:30:55 -05:00
Ben Boeckel 1f1fdff7fa cmListCommand: prefer strtol to atoi
This allows for detecting errors.
2021-02-18 08:30:55 -05:00
Kitware Robot b8762f3189 CMake Nightly Date Stamp 2021-02-18 00:01:15 -05:00