Commit Graph

60986 Commits

Author SHA1 Message Date
Brad King 283432a1aa Merge topic 'ninja-collation-dependencies'
b6a5382217 Ninja: depend on language module information files directly
0ace6053e8 Ninja: track modmap dependencies properly
b215cbc07d Ninja: remove the modmap as an output of the scanner

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8197
2023-02-14 09:16:42 -05:00
Brad King 06e62ff5e8 Merge topic 'KateDontIncludeFilesInBuildDir'
8802b81b0d Kate: don't include files in the CMakeFiles/ dir in the project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8196
2023-02-14 09:15:59 -05:00
Brad King 0be3d201c6 Merge topic 'ci-windows-FindPatch'
1e35257ee1 ci: Enable FindPatch tests on Windows VS builds
04b5df1f3a Tests: Fix FindPatch test with VS generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8200
2023-02-14 08:50:34 -05:00
Brad King 6fc83d7a25 Merge branch 'release-3.26' 2023-02-14 08:46:18 -05:00
Brad King aec5dd482f Merge topic 'lcc-major-version'
2a75edb342 LCC: Fix extraction of __LCC__ version components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8199
2023-02-14 08:46:18 -05:00
Brad King d18dd364d3 Merge topic 'lcc-major-version' into release-3.26
2a75edb342 LCC: Fix extraction of __LCC__ version components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8199
2023-02-14 08:46:17 -05:00
Kitware Robot df52b85b07 CMake Nightly Date Stamp 2023-02-14 00:01:11 -05:00
Alexander Neundorf 8802b81b0d Kate: don't include files in the CMakeFiles/ dir in the project
These files are generated by cmake, they shouldn't be in the project.
2023-02-13 22:36:47 +01:00
Brad King 1e35257ee1 ci: Enable FindPatch tests on Windows VS builds
The `patch` tool comes with Git for Windows, which is installed on our
Windows CI hosts as part of running their gitlab-runner.
2023-02-13 12:35:46 -05:00
Brad King 04b5df1f3a Tests: Fix FindPatch test with VS generators
Tell CTest the project used to name the `.sln` file.
2023-02-13 12:35:44 -05:00
Brad King 2a75edb342 LCC: Fix extraction of __LCC__ version components
Previously the logic only worked for major versions of the form `1.xx`.
Fix it to work with versions `2.xx` and above.
2023-02-13 09:29:32 -05:00
Brad King 93edb4d0c0 Merge topic 'deprecate-pre-3.5'
3a4791548d Deprecate compatibility with CMake versions older than 3.5
1edf138506 Tests/RunCMake: Update cmake_minimum_required versions
65a1c379ee Tests/CTestTest*: Update cmake_minimum_required versions
589e6fdcd1 Tests: Update cmake_minimum_required versions in a few tests
3092b14ed0 Tests: Teach RunCMake to optionally ignore policy version deprecation warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !8192
2023-02-13 09:08:23 -05:00
Kitware Robot 52f62cbffe CMake Nightly Date Stamp 2023-02-13 00:02:29 -05:00
Kitware Robot 323f5feb93 CMake Nightly Date Stamp 2023-02-12 00:01:15 -05:00
Brad King b44f50cd1a Merge branch 'release-3.26' 2023-02-11 06:33:20 -05:00
Brad King 49f32b27ed Merge topic 'test-https-connections'
3350c17451 ci: Enable file(DOWNLOAD) TLS_VERIFY test case in CI jobs
17b47da3d8 Tests: Add test for file(DOWNLOAD) with TLS_VERIFY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8194
2023-02-11 06:33:20 -05:00
Brad King e66bd7f584 Merge topic 'test-https-connections' into release-3.26
3350c17451 ci: Enable file(DOWNLOAD) TLS_VERIFY test case in CI jobs
17b47da3d8 Tests: Add test for file(DOWNLOAD) with TLS_VERIFY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8194
2023-02-11 06:33:19 -05:00
Brad King 3a4791548d Deprecate compatibility with CMake versions older than 3.5
Issue a deprecation warning on calls to `cmake_minimum_required` or
`cmake_policy` that set policies based on versions older than 3.5.
Note that the effective policy version includes `...<max>` treatment.
Update the check from commit 5845c218d7 (Deprecate compatibility with
CMake versions older than 2.8.12, 2020-06-12, v3.19.0-rc1~629^2).
2023-02-11 06:25:11 -05:00
Brad King 1edf138506 Tests/RunCMake: Update cmake_minimum_required versions
For policy-specific tests, use the version before the policy was
introduced.  Otherwise, use 3.5 where possible.

Also, remove `cmake_minimum_required()` and `project()` calls from
individual cases where they are handled by `CMakeLists.txt`.
2023-02-11 06:24:22 -05:00
Kitware Robot 48c69eeafe CMake Nightly Date Stamp 2023-02-11 00:01:12 -05:00
Ben Boeckel b6a5382217 Ninja: depend on language module information files directly
Now that `GetLinkedTargetDirectories` can get the exact dependencies,
use them to simplify the collation dependency graph.
2023-02-10 18:42:02 -05:00
Ben Boeckel 0ace6053e8 Ninja: track modmap dependencies properly
Mark modmaps as outputs of the collation step.
2023-02-10 18:03:15 -05:00
Ben Boeckel b215cbc07d Ninja: remove the modmap as an output of the scanner
It's actually an output of the collator.
2023-02-10 17:51:46 -05:00
Brad King 3350c17451 ci: Enable file(DOWNLOAD) TLS_VERIFY test case in CI jobs 2023-02-10 12:22:00 -05:00
scivision 17b47da3d8 Tests: Add test for file(DOWNLOAD) with TLS_VERIFY
Occasionally curl updates introduce errors in https verification.
Add an explicit test for this capability, activated by an undocumented
option that we can use in CI to specify a URL to test.

Co-authored-by: Brad King <brad.king@kitware.com>
Fixes: #24405
Issue: #24147
Issue: #24398
2023-02-10 12:22:00 -05:00
Brad King 78299083d2 Merge topic 'cmake-gui-browse-manual-page'
b5383bc767 cmake-gui: Add optional filename argument to --browse-manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8190
2023-02-10 10:03:30 -05:00
Brad King f888d03c70 Merge topic 'update-kwsys'
9ef25b08e0 bootstrap: Update for KWSys removal of String.hxx
e66d42ef10 Merge branch 'upstream-KWSys' into update-kwsys
fa9b4e530f KWSys 2023-02-09 (3eea0b90)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8188
2023-02-10 10:02:40 -05:00
Brad King 9f7a584173 Merge branch 'release-3.26' 2023-02-10 09:58:49 -05:00
Brad King 81dfe0a330 Merge topic 'curl-macos-tls'
0d312728eb curl: Backport upstream fix for SecureTransport on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8193
2023-02-10 09:58:49 -05:00
Brad King 9b7d086220 Merge topic 'curl-macos-tls' into release-3.26
0d312728eb curl: Backport upstream fix for SecureTransport on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8193
2023-02-10 09:58:48 -05:00
Brad King 65a1c379ee Tests/CTestTest*: Update cmake_minimum_required versions 2023-02-10 09:51:46 -05:00
Brad King 589e6fdcd1 Tests: Update cmake_minimum_required versions in a few tests 2023-02-10 09:51:35 -05:00
Kitware Robot 917f675b9e CMake Nightly Date Stamp 2023-02-10 00:01:18 -05:00
Brad King 0d312728eb curl: Backport upstream fix for SecureTransport on macOS
Backport upstream curl commit `16bb32e104d` (sectransp: fix for
incomplete read/writes, 2023-01-05) to fix TLS support on macOS.

Fixes: #24398
2023-02-09 16:54:25 -05:00
Brad King 3092b14ed0 Tests: Teach RunCMake to optionally ignore policy version deprecation warnings
Avoid requiring tests for deprecated behavior to match the warnings
explicitly.
2023-02-09 16:20:31 -05:00
Brad King 8a73af36b0 Merge branch 'release-3.26' 2023-02-09 14:54:12 -05:00
Brad King 29bcbcab4f CMake 3.26.0-rc2 v3.26.0-rc2 2023-02-09 14:21:24 -05:00
Brad King ab4128984c Merge branch 'release-3.26' 2023-02-09 14:19:42 -05:00
Brad King 1d4619953e Merge topic 'doc-configure-log'
2311b0a7f7 Help: Clarify that the documented configure log location is not stable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8191
2023-02-09 14:19:42 -05:00
Brad King 2dac3887da Merge topic 'doc-configure-log' into release-3.26
2311b0a7f7 Help: Clarify that the documented configure log location is not stable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8191
2023-02-09 14:19:41 -05:00
Brad King 2311b0a7f7 Help: Clarify that the documented configure log location is not stable
Issue: #23200
2023-02-09 13:39:49 -05:00
Brad King d4ec95b5b7 Merge branch 'release-3.26' 2023-02-09 13:23:02 -05:00
Brad King bfd01ea357 Merge topic 'clarify-clang-tidy-export-fixes-doc'
f9d9258d5c Help: Avoid making guarantees about <LANG>_CLANG_TIDY_EXPORT_FIXES_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8189
2023-02-09 13:23:02 -05:00
Brad King 5a402f4999 Merge topic 'clarify-clang-tidy-export-fixes-doc' into release-3.26
f9d9258d5c Help: Avoid making guarantees about <LANG>_CLANG_TIDY_EXPORT_FIXES_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8189
2023-02-09 13:23:01 -05:00
Kyle Edwards f9d9258d5c Help: Avoid making guarantees about <LANG>_CLANG_TIDY_EXPORT_FIXES_DIR
Rather than stating specifically which files may be written or deleted,
simply state that CMake owns the directory and that a dedicated
directory should be used for exporting the fixes.
2023-02-09 11:41:48 -05:00
Kyle Edwards b5383bc767 cmake-gui: Add optional filename argument to --browse-manual 2023-02-09 11:33:06 -05:00
Brad King 9ef25b08e0 bootstrap: Update for KWSys removal of String.hxx 2023-02-09 10:21:47 -05:00
Brad King e66d42ef10 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2023-02-09 (3eea0b90)
2023-02-09 10:15:38 -05:00
KWSys Upstream fa9b4e530f KWSys 2023-02-09 (3eea0b90)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 3eea0b90f57dd3923abe22412ca71d4dccef7c6e (master).

Upstream Shortlog
-----------------

Brad King (1):
      c3201073 String.hxx: Drop this component of KWSys
2023-02-09 10:15:37 -05:00
Brad King 536f35c4f1 Merge topic 'vs9-deprecate'
d7f440c5db Deprecate Visual Studio 9 2008 generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8181
2023-02-09 10:14:10 -05:00