summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmGlobalVisualStudio10Generator: Auto restore NuGet packages.Carsten Rudolph2022-01-2232-8/+319
|
* cmBuildOptions: Split build arguments into separate object.Carsten Rudolph2022-01-2228-53/+109
|
* Help: Update preset schema description for version 3 entries.Carsten Rudolph2022-01-211-4/+4
|
* CMake Nightly Date StampKitware Robot2022-01-111-1/+1
|
* Merge topic 'update-curl'Brad King2022-01-10102-2019/+3572
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 9341e63233 curl: Set build options the way we need for CMake 697e8871a1 Merge branch 'upstream-curl' into update-curl a1f6ec647c curl 2022-01-05 (801bd513) bdb3a8203e curl: Update script to get curl 7.81.0 e9260cf4b0 Merge branch 'upstream-curl' into update-curl a4ad12d843 curl 2021-09-22 (c7aef0a9) 520809b5ae curl: Update script for new curl mailing list address Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6845
| * curl: Set build options the way we need for CMakeBrad King2022-01-072-16/+19
| |
| * Merge branch 'upstream-curl' into update-curlBrad King2022-01-07101-2001/+3551
| |\ | | | | | | | | | | | | * upstream-curl: curl 2022-01-05 (801bd513)
| | * curl 2022-01-05 (801bd513)Curl Upstream2022-01-07101-2000/+3551
| | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 801bd5138ce31aa0d906fa4e2eabfc599d74e793 (curl-7_81_0).
| * | curl: Update script to get curl 7.81.0Brad King2022-01-071-1/+1
| | |
| * | Merge branch 'upstream-curl' into update-curlBrad King2022-01-070-0/+0
| |\ \ | | |/
| | * curl 2021-09-22 (c7aef0a9)Curl Upstream2022-01-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit c7aef0a945f9b6fb6d3f91716a21dfe2f4ea635f (curl-7_79_1).
| * | curl: Update script for new curl mailing list addressBrad King2022-01-071-1/+1
| | |
* | | Merge topic 'cmake-presets-include'Brad King2022-01-1058-1331/+1983
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CMakePresets: Add include fieldKyle Edwards2022-01-0742-7/+351
| | | | | | | | | | | | | | | | Fixes: #21331
| * | | Refactor: Generalize file graph in CMakePresetsKyle Edwards2022-01-074-29/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Refactor: Split JSON processing into configure, build, and test presetsKyle Edwards2022-01-066-599/+821
| | | | | | | | | | | | | | | | Split up the file so that it won't be too big on some systems.
| * | | Refactor: Rename cmCMakePresetsFile to cmCMakePresetsGraphKyle Edwards2022-01-0613-221/+224
| | | | | | | | | | | | | | | | And change all references to "file" to say "graph" instead.
* | | | Merge topic 'cmake-ide-preset-command-line-length'Brad King2022-01-101-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Guide: Recommend -C for IDE presets instead of -DKyle Edwards2022-01-071-0/+6
| | |/ / | |/| | | | | | | | | | Issue: #23083
* | | | CMake Nightly Date StampKitware Robot2022-01-101-1/+1
| | | |
* | | | Merge topic 'ExternalProject-IS_NEWER_THAN'Craig Scott2022-01-101-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checksCraig Scott2022-01-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | CMake Nightly Date StampKitware Robot2022-01-091-1/+1
|/ / / /
* | | | CMake Nightly Date StampKitware Robot2022-01-081-1/+1
|/ / /
* | | Merge topic 'GoogleTest-dots'Brad King2022-01-079-90/+171
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1f9554d4e9 GoogleTest: Fix regex matching all dots in the suite name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6822
| * | | GoogleTest: Fix regex matching all dots in the suite nameFrancesco Guastella2022-01-079-90/+171
| | | |
* | | | Merge topic 'cmcldeps-cross'Brad King2022-01-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Ninja: Do not use cmcldeps for RC on non-Windows hostsMartin Storsjö2022-01-061-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'msvc-arm64ec'Brad King2022-01-071-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26f52508f2 MSVC: update arm64ec default flags and lib Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6841
| * | | | MSVC: update arm64ec default flags and libmoyo19972022-01-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'nghttp2-fix-ssize_t-dep'Brad King2022-01-071-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99acfe41f5 cmnghttp2: check for HAVE_SIZEOF_SSIZE_T and not HAVE_SSIZE_T Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6831
| * | | | | cmnghttp2: check for HAVE_SIZEOF_SSIZE_T and not HAVE_SSIZE_TAli Mohammad Pur2022-01-061-4/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'release-3.22'Brad King2022-01-070-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'armasm-6.17' into release-3.22Brad King2022-01-071-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2777ed008 ASM: Fix identification of armasm 6.17+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6833
* | \ \ \ \ \ Merge topic 'armasm-6.17'Brad King2022-01-071-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2777ed008 ASM: Fix identification of armasm 6.17+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6833
| * | | | | | ASM: Fix identification of armasm 6.17+Jukka Jalkanen2022-01-061-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Spelling of "ARM Compiler" changed to "Arm Compiler".
* | | | | | Merge topic 'refactor_vsproject_type'Brad King2022-01-077-47/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b7520b94d Consolidate usage of VsProjectType 938a53f4f1 Refactor VsProjectType to its own header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6830
| * | | | | | Consolidate usage of VsProjectTypeSumit Bhardwaj2021-12-234-42/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Refactor VsProjectType to its own headerSumit Bhardwaj2021-12-233-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move VsProject to its own header so that we can consolidate IsManaged and IsCSharp.
* | | | | | | Merge topic 'cpack-pkg-domains'Brad King2022-01-074-1/+89
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da737d34e0 CPack/productbuild: add options to control domains element Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6825
| * | | | | | | CPack/productbuild: add options to control domains elementDavid Wosk2022-01-064-1/+89
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | CMake Nightly Date StampKitware Robot2022-01-071-1/+1
|/ / / / / /
* | | | | | Merge topic 'try-link-ld-warning-no_pie'Brad King2022-01-061-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f745e0497e CheckCompilerFlags: Catch linker warning about ignored flags Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6836
| * | | | | | CheckCompilerFlags: Catch linker warning about ignored flagsCraig Scott2022-01-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example warning from arm64 macOS that this will now catch: ld: warning: -no_pie ignored for arm64 Fixes: #22961
* | | | | | | Merge topic 'xcode-framework-system-includes'Brad King2022-01-066-1/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d99cff236 Xcode: Properly identify frameworks with system includes Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6815
| * | | | | | | Xcode: Properly identify frameworks with system includesGregor Jasny2021-12-226-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the complete include path for being a system include, not the derived framework search path. The code for Ninja and Makefile generators does exactly the same. Fixes: #23011
* | | | | | | | CMake Nightly Date StampKitware Robot2022-01-061-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2022-01-051-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-01-041-1/+1
| | | | | |
* | | | | | Merge topic 'cmMachO_h_missing_header'Craig Scott2022-01-031-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1ca50d9fc cmMachO: Add missing header for std::unique_ptr Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6835