Commit Graph

55764 Commits

Author SHA1 Message Date
Brad King 39eabc17c4 Merge topic 'cmake-presets-include'
26a5512c0f CMakePresets: Add include field
a239f23a98 Refactor: Generalize file graph in CMakePresets
84d440caac Refactor: Split JSON processing into configure, build, and test presets
fd6ea2f67f Refactor: Rename cmCMakePresetsFile to cmCMakePresetsGraph

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6829
2022-01-10 17:12:03 -05:00
Brad King b9a40fd7ba Merge topic 'cmake-ide-preset-command-line-length'
94de63effa Guide: Recommend -C for IDE presets instead of -D

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Bob Brown <bobbrow@microsoft.com>
Merge-request: !6846
2022-01-10 17:11:13 -05:00
Kitware Robot 1e839298b0 CMake Nightly Date Stamp 2022-01-10 00:01:48 -05:00
Craig Scott 055d574084 Merge topic 'ExternalProject-IS_NEWER_THAN'
d73fc5dd2a ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6847
2022-01-09 19:47:07 -05:00
Kitware Robot 290a0da3d7 CMake Nightly Date Stamp 2022-01-09 00:01:06 -05:00
Craig Scott d73fc5dd2a ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks
This change was originally made in 404cddb7bb (ExternalProject:
Fix misuse of IS_NEWER_THAN in timestamp checks, 2021-02-21),
but was reverted by 57d442e182 (Revert ExternalProject and
FetchContent refactoring, 2021-03-10) due to regressions from
other changes. Reapply this fix on its own, since it is still valid.

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 redo downloads when they match exactly.
2022-01-08 20:51:44 +11:00
Kitware Robot 3279cec012 CMake Nightly Date Stamp 2022-01-08 00:01:14 -05:00
Kyle Edwards 94de63effa Guide: Recommend -C for IDE presets instead of -D
Issue: #23083
2022-01-07 12:43:53 -05:00
Brad King b996e576c2 Merge topic 'GoogleTest-dots'
1f9554d4e9 GoogleTest: Fix regex matching all dots in the suite name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6822
2022-01-07 10:23:54 -05:00
Brad King 7b1099a52f Merge topic 'cmcldeps-cross'
d49e168e1b Ninja: Do not use cmcldeps for RC on non-Windows hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dmitry Mikushin <dmitry@kernelgen.org>
Merge-request: !6843
2022-01-07 09:43:39 -05:00
Brad King efe3410cbb Merge topic 'msvc-arm64ec'
26f52508f2 MSVC: update arm64ec default flags and lib

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6841
2022-01-07 09:42:53 -05:00
Brad King 155434f344 Merge topic 'nghttp2-fix-ssize_t-dep'
99acfe41f5 cmnghttp2: check for HAVE_SIZEOF_SSIZE_T and not HAVE_SSIZE_T

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6831
2022-01-07 09:41:53 -05:00
Brad King ec02e94119 Merge branch 'release-3.22' 2022-01-07 09:40:15 -05:00
Brad King 46b34407cb Merge topic 'armasm-6.17'
c2777ed008 ASM: Fix identification of armasm 6.17+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6833
2022-01-07 09:40:15 -05:00
Brad King 4b8126fa40 Merge topic 'armasm-6.17' into release-3.22
c2777ed008 ASM: Fix identification of armasm 6.17+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6833
2022-01-07 09:40:14 -05:00
Brad King 2294553070 Merge topic 'refactor_vsproject_type'
3b7520b94d Consolidate usage of VsProjectType
938a53f4f1 Refactor VsProjectType to its own header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6830
2022-01-07 09:39:22 -05:00
Brad King 11b0ab1672 Merge topic 'cpack-pkg-domains'
da737d34e0 CPack/productbuild: add options to control domains element

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6825
2022-01-07 09:38:30 -05:00
Francesco Guastella 1f9554d4e9 GoogleTest: Fix regex matching all dots in the suite name 2022-01-07 09:25:57 -05:00
Kitware Robot 5dd953ca2c CMake Nightly Date Stamp 2022-01-07 00:01:12 -05:00
Kyle Edwards 26a5512c0f CMakePresets: Add include field
Fixes: #21331
2022-01-06 19:46:41 -05:00
Kyle Edwards a239f23a98 Refactor: Generalize file graph in CMakePresets
Before this refactoring, presets had a simple flag that marked them
as "user" or "not user", and checking the file graph of two files
was as simple as checking this flag. This only allowed for two files
in the graph. Generalize the code to allow for arbitrarily many files
in the graph.
2022-01-06 19:46:41 -05:00
Kyle Edwards 84d440caac Refactor: Split JSON processing into configure, build, and test presets
Split up the file so that it won't be too big on some systems.
2022-01-06 18:52:30 -05:00
Kyle Edwards fd6ea2f67f Refactor: Rename cmCMakePresetsFile to cmCMakePresetsGraph
And change all references to "file" to say "graph" instead.
2022-01-06 18:52:30 -05:00
Martin Storsjö d49e168e1b Ninja: Do not use cmcldeps for RC on non-Windows hosts
The `cmcldeps` executable is only built on Windows.  If running MSVC on
a different OS (with various compatibility wrapping), don't try to use
`cmcldeps`, as the executable doesn't exist.

Fixes: #21760
2022-01-06 15:42:45 -05:00
moyo1997 26f52508f2 MSVC: update arm64ec default flags and lib
Update the support added by commit 4ea3a88625 (MSVC: Add support for
targeting ARM64EC, 2020-12-30, v3.20.0-rc1~121^2).

Add `softintrin.lib` to `CMAKE_C_STANDARD_LIBRARIES_INIT`.

Remove `/D_ARM64EC_WORKAROUND` from the flags as it was only ever needed
in preview versions of VS.

Issue: #21724
2022-01-06 15:31:32 -05:00
Ali Mohammad Pur 99acfe41f5 cmnghttp2: check for HAVE_SIZEOF_SSIZE_T and not HAVE_SSIZE_T
The `check_type_size(ssize_t SIZEOF_SSIZE_T` call in cmcurl (referenced
by the comment above) defines `HAVE_SIZEOF_SSIZE_T` and not
`HAVE_SSIZE_T`.  The `HAVE_SSIZE_T` variable *might* get defined, but
via the `CHECK_TYPE_SIZE(ssize_t SSIZE_T)` call in cmlibarchive, which
would be configured *after* cmnghttp2, and so the first configure would
lead to an invalid `cmnghttp2/config.h` file.
2022-01-06 21:32:59 +03:30
Jukka Jalkanen c2777ed008 ASM: Fix identification of armasm 6.17+
Spelling of "ARM Compiler" changed to "Arm Compiler".
2022-01-06 11:55:38 -05:00
David Wosk da737d34e0 CPack/productbuild: add options to control domains element
The domains element determines the required authorization level needed
for the install. The auth attribute of the pkg-ref element has been
deprecated in favor of domains, so if the domains options are
specified, the auth attribute is omitted.

Fixes: #23030
2022-01-06 11:33:25 -05:00
Brad King 13e71b7c3e Merge topic 'try-link-ld-warning-no_pie'
f745e0497e CheckCompilerFlags: Catch linker warning about ignored flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6836
2022-01-06 10:14:06 -05:00
Brad King ac892a64a9 Merge topic 'xcode-framework-system-includes'
7d99cff236 Xcode: Properly identify frameworks with system includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6815
2022-01-06 10:12:26 -05:00
Kitware Robot 2f244b4cb8 CMake Nightly Date Stamp 2022-01-06 00:01:07 -05:00
Kitware Robot 353318cc53 CMake Nightly Date Stamp 2022-01-05 00:01:08 -05:00
Kitware Robot 0537be19fd CMake Nightly Date Stamp 2022-01-04 00:01:11 -05:00
Craig Scott f940c833dc Merge topic 'cmMachO_h_missing_header'
a1ca50d9fc cmMachO: Add missing header for std::unique_ptr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6835
2022-01-03 16:51:18 -05:00
Craig Scott ca206d6e46 Merge topic 'doc-if-floating-point'
6b170578b8 Help: Non-zero floating point numbers are true in if() expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6834
2022-01-03 16:46:32 -05:00
Craig Scott 6b170578b8 Help: Non-zero floating point numbers are true in if() expressions
Fixes: #22991
2022-01-04 08:45:23 +11:00
Kitware Robot 65b1b51983 CMake Nightly Date Stamp 2022-01-03 00:01:24 -05:00
Craig Scott f745e0497e CheckCompilerFlags: Catch linker warning about ignored flags
Example warning from arm64 macOS that this will now catch:

ld: warning: -no_pie ignored for arm64

Fixes: #22961
2022-01-03 09:35:16 +11:00
Craig Scott a1ca50d9fc cmMachO: Add missing header for std::unique_ptr
Builds were previously relying on <memory> being included
by <string>, but not all compilers do that and we shouldn't
be relying on that anyway.
2022-01-02 21:15:19 +11:00
Kitware Robot f96729e80c CMake Nightly Date Stamp 2022-01-02 00:01:07 -05:00
Kitware Robot 5c09fe0283 CMake Nightly Date Stamp 2022-01-01 00:01:07 -05:00
Kitware Robot b3ae5bfba7 CMake Nightly Date Stamp 2021-12-31 00:01:14 -05:00
Kitware Robot 0876d54eed CMake Nightly Date Stamp 2021-12-30 00:01:08 -05:00
Kitware Robot 90c83564f0 CMake Nightly Date Stamp 2021-12-29 00:01:08 -05:00
Kitware Robot 6f6b00d1f4 CMake Nightly Date Stamp 2021-12-28 00:01:06 -05:00
Kitware Robot 2acddd2660 CMake Nightly Date Stamp 2021-12-27 00:01:18 -05:00
Kitware Robot a0efad76ab CMake Nightly Date Stamp 2021-12-26 00:01:07 -05:00
Kitware Robot 02ec22472f CMake Nightly Date Stamp 2021-12-25 00:01:06 -05:00
Kitware Robot 71ef68ef96 CMake Nightly Date Stamp 2021-12-24 00:01:07 -05:00
Sumit Bhardwaj 3b7520b94d Consolidate usage of VsProjectType
Move ProjectFileExtension handling logic to use ProjectType and remove
extraneous checks in .Net SDK style project generation. This change will
make introducing new project types relatively simpler.
2021-12-23 15:53:04 -08:00