Commit Graph

31087 Commits

Author SHA1 Message Date
Brad King 6cd0908072 Merge topic 'autogen-ui-header-depends'
9cebdbec77 AUTOUIC: Fix cyclic dependency between generated UI headers and timestamp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6359
2021-07-20 11:46:01 -04:00
Kitware Robot 6521cededd CMake Nightly Date Stamp 2021-07-20 00:01:10 -04:00
Alexey Edelev 9cebdbec77 AUTOUIC: Fix cyclic dependency between generated UI headers and timestamp
Once the generated UI headers are created by UIC they also are involved
into processing in next run on ninja.  Autogen adds `ui_*.h` files to
the deps file `ui_*.h` and this cause timestamp start depend on `ui_*.h`.
Meanwhile `ui_*.h` depend on timestamp because of the explicit rules
added by commit 1265c65b33 (AUTOUIC: Collect ui header files for Ninja
generator, 2021-02-18, v3.21.0-rc1~600^2).  Avoid adding `ui_*.h` to
deps file at second ninja run.

Fixes: #16776
2021-07-19 13:28:16 -04:00
Brad King 4ff651eb52 Merge topic 'cmake-presets-no-binary-dir-no-s' into release-3.21
aa874dc609 CMakePresets.json: Fix expansion issue with empty binaryDir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6358
2021-07-19 12:59:01 -04:00
Brad King a9900c8364 Merge topic 'cmake-presets-no-binary-dir-no-s'
aa874dc609 CMakePresets.json: Fix expansion issue with empty binaryDir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6358
2021-07-19 12:59:01 -04:00
Brad King 1f6e1a2d78 Merge topic 'vs2022'
0c7f918fb1 VS: Update Visual Studio 17 2022 generator for Preview 2
1ac1436b25 VS: Fix `/sourceDependencies` flag table entries for v143
919fc7fd5f VS: Remove broken EnableASAN entry from flag table for v143
3f19847b28 VS: Remove empty ExternalWarningLevel entry from flag table for v143
ccb6083cbe VS: Remove empty LanguageStandard entries from flag table for v143
c167de7e70 VS: Remove empty ConformanceMode entry from flag table for v143
993d706a17 VS: Populate `/JMC-` flag table entry for v143
a070d87e08 VS: Populate `-Qspectre-` flag table entry for v143
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Egor Pugin <egor.pugin@gmail.com>
Merge-request: !6350
2021-07-19 12:41:20 -04:00
Kitware Robot fabbb69e69 CMake Nightly Date Stamp 2021-07-19 00:01:13 -04:00
Kitware Robot 0094d12ead CMake Nightly Date Stamp 2021-07-18 00:01:07 -04:00
Kitware Robot 7f7e7485f3 CMake Nightly Date Stamp 2021-07-17 00:01:10 -04:00
Kyle Edwards aa874dc609 CMakePresets.json: Fix expansion issue with empty binaryDir
When resolving binaryDir into a full path from a relative path, we
forgot to check if binaryDir is altogether empty, causing empty
binaryDir's to resolve to the source directory. Fix this.

Fixes: #22434
2021-07-16 10:25:40 -04:00
Kitware Robot 4e17e90988 CMake Nightly Date Stamp 2021-07-16 00:01:08 -04:00
Brad King 0c7f918fb1 VS: Update Visual Studio 17 2022 generator for Preview 2
In particular, update to toolset `v143`.

Fixes: #22339
2021-07-15 13:12:55 -04:00
Kitware Robot 769c539d59 CMake Nightly Date Stamp 2021-07-15 00:01:14 -04:00
Brad King ff7a2e37bf CMake 3.21.0 2021-07-14 10:10:23 -04:00
Brad King 5e8a29c10b Merge topic 'cpack-deb-debuginfo'
9dc007e17c Refactor: Drop redundand `std::endl` calls in the middle of output
afcc5449e8 Refactor: Use `cmStrToLong` instead of `std::strtol`
13549674cc Refactor: Avoid duplicate calls to `GetOption("GEN_DBGSYMDIR")`
7add10f288 Refactor: Deduplicate code of `createDebPackages()`
593ff734b0 CPack/DEB: dbgsym package not generated for non-component packaging
c8f298ae08 Refactor: Extract packaged files finder into a function
7fd3134ea1 Refactor: cmCPackDebGenerator::PackageComponents handle `else` first
008321595a Refactor: Change return value to bool for private members
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6342
2021-07-14 09:26:36 -04:00
Brad King 17f5b4446c Merge topic 'link-item-cleanup'
d9e4b47432 cmGeneratorTarget: Clarify logic recognizing explicit link interface
ff97944806 cmGeneratorTarget: Clarify cmLinkImplItem constructor call
8112480921 cmGeneratorTarget: Clarify ExpandLinkItems local variable role
33f0505f01 cmGeneratorTarget: Simplify ExpandLinkItems signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6347
2021-07-14 09:25:22 -04:00
Brad King bf8bf11fe5 Merge topic 'doc-cmake-build-signature'
161f1f42d6 Help: Clarify 'cmake --build' signature alternatives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6343
2021-07-14 09:22:27 -04:00
Kitware Robot e274bd6fd9 CMake Nightly Date Stamp 2021-07-14 00:01:12 -04:00
Brad King d9e4b47432 cmGeneratorTarget: Clarify logic recognizing explicit link interface 2021-07-13 11:53:00 -04:00
Brad King ff97944806 cmGeneratorTarget: Clarify cmLinkImplItem constructor call 2021-07-13 11:52:59 -04:00
Brad King 8112480921 cmGeneratorTarget: Clarify ExpandLinkItems local variable role 2021-07-13 11:52:58 -04:00
Brad King 33f0505f01 cmGeneratorTarget: Simplify ExpandLinkItems signature 2021-07-13 11:31:16 -04:00
Alex Turbov 9dc007e17c Refactor: Drop redundand std::endl calls in the middle of output 2021-07-13 16:42:04 +03:00
Brad King 161f1f42d6 Help: Clarify 'cmake --build' signature alternatives
Documentation added by

* commit 4f4f2028b8 (Help: Add documentation for buildPresets and
                     testPresets, 2021-01-13, v3.20.0-rc1~51^2~7)
* commit 676ecf0d37 (cmake-presets: Add build and test presets,
                     2020-12-14, v3.20.0-rc1~51^2~6)

used square brackets in the `cmake --build` signature to indicate
non-optional alternatives, which is not a typical convention.
A common convention is to use parentheses instead, but in this
case it is probably clearer to list the two signatures separately.

Fixes: #22413
2021-07-13 09:41:26 -04:00
Alex Turbov afcc5449e8 Refactor: Use cmStrToLong instead of std::strtol 2021-07-13 08:56:39 -04:00
Alex Turbov 13549674cc Refactor: Avoid duplicate calls to GetOption("GEN_DBGSYMDIR") 2021-07-13 08:36:12 -04:00
Alex Turbov 7add10f288 Refactor: Deduplicate code of createDebPackages()
Also, fix incorrect `retval` accumulation.
2021-07-13 08:36:12 -04:00
Alex Turbov 593ff734b0 CPack/DEB: dbgsym package not generated for non-component packaging
Fix: #19735
2021-07-13 08:36:12 -04:00
Alex Turbov c8f298ae08 Refactor: Extract packaged files finder into a function 2021-07-13 08:36:12 -04:00
Alex Turbov 7fd3134ea1 Refactor: cmCPackDebGenerator::PackageComponents handle else first
Also, return early to reduce nesting level of the function body.
2021-07-13 08:35:27 -04:00
Alex Turbov 008321595a Refactor: Change return value to bool for private members
The `cmCPackDebGenerator::createDeb()` and `cmCPackDebGenerator::createDbgsymDDeb()`
in fact have boolean return value.
2021-07-13 08:35:27 -04:00
Alex Turbov 45a6fa0c33 Refactor: Drop unnecessary if before return 2021-07-13 08:35:27 -04:00
Alex Turbov 700abe7bca Refactor: Drop useless assignments of retval before return 2021-07-13 08:35:27 -04:00
Brad King 3265fa51cd Merge topic 'ctest-environment-modifications'
de4f1f26b0 CTest: add an ENVIRONMENT_MODIFICATION property
4c757fa3c8 Help/prop_test/ENVIRONMENT: clarify the scope of the changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6299
2021-07-13 08:24:36 -04:00
Brad King 95c97a12e8 Merge topic 'state-project-kind'
6c440ea3ce cmake: Model normal and try-compile project kinds explicitly
2065bd73cb cmState: Construct with mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6337
2021-07-13 08:23:18 -04:00
Brad King 8fcd3ecb2a Merge topic 'vs-CMAKE_MSVCIDE_RUN_PATH'
542bd343e3 VS: Always enable CMAKE_MSVCIDE_RUN_PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6334
2021-07-13 08:20:36 -04:00
Brad King 235795d502 Merge topic 'file-grd-arch'
5aeda18297 file(GET_RUNTIME_DEPENDENCIES): Use cmELF unconditionally
17aa96bb7a Merge branch 'master' into file-grd-arch
b2c03347b0 file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6339
2021-07-13 08:18:32 -04:00
Kitware Robot 15bd593f4f CMake Nightly Date Stamp 2021-07-13 00:01:11 -04:00
Kyle Edwards 5aeda18297 file(GET_RUNTIME_DEPENDENCIES): Use cmELF unconditionally
Starting with CMake 3.22, cmELF.h is always available, so use it
unconditionally.
2021-07-12 16:12:52 -04:00
Kyle Edwards 17aa96bb7a Merge branch 'master' into file-grd-arch 2021-07-12 16:12:46 -04:00
Kyle Edwards b2c03347b0 file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependencies
Fixes: #22106
2021-07-12 16:11:38 -04:00
Brad King 6c440ea3ce cmake: Model normal and try-compile project kinds explicitly
Construct with the project kind instead of mutating state after
construction.
2021-07-12 12:21:52 -04:00
Brad King 2065bd73cb cmState: Construct with mode 2021-07-12 12:21:44 -04:00
Asit Dhal 542bd343e3 VS: Always enable CMAKE_MSVCIDE_RUN_PATH
Do not require a language to be enabled.

Fixes: #22343
2021-07-12 11:19:01 -04:00
Brad King c9cd039e5f Merge topic 'LWYU-externalization'
14e57e9637 LINK_WHAT_YOU_USE feature: externalize configuration
9c5132a586 PGI: Fix "LINKER:" prefix generated separator
8a93de080c cmGeneratorTarget: Add method for LINKER: prefix translation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6306
2021-07-12 08:43:32 -04:00
Brad King ca696c73e1 Merge topic 'target-stable-order'
9e9ab61e2f cmGlobalGenerator: Process targets in a stable order
8a812dde61 cmGlobalGenerator: Use cmMakefile::CreateNewTarget to add global targets
854dcb0d01 cmMakefile: Split out CreateNewTarget from AddNewTarget

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6267
2021-07-12 08:39:46 -04:00
Kitware Robot 52a73d1654 CMake Nightly Date Stamp 2021-07-12 00:01:19 -04:00
Kitware Robot 3c521b89f1 CMake Nightly Date Stamp 2021-07-11 00:01:06 -04:00
Kitware Robot 4f5957d72d CMake Nightly Date Stamp 2021-07-10 00:01:09 -04:00
Marc Chevrier 14e57e9637 LINK_WHAT_YOU_USE feature: externalize configuration
Currently, this feature is only supported on ELF platforms. So, the property
LINK_WHAT_YOU_USE will be ignored for other plateforms.
Moreover, flags and commands are now controled by CMake variables.

Fixes: #20174
2021-07-09 14:50:50 +02:00