Commit Graph

61496 Commits

Author SHA1 Message Date
Marc Chevrier
9913c28ebb FindPython: Add Windows/ARM support
Fixes: #24587
2023-03-26 10:58:12 +02:00
Brad King
2c6a92c055 Merge topic 'remove-doxygen.config'
2ae6aeacb1 Actually remove unused top-level doxygen.config file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8353
2023-03-22 07:40:14 -04:00
Kitware Robot
941f31a890 CMake Nightly Date Stamp 2023-03-22 00:01:15 -04:00
Brad King
b69441c796 Merge topic 'ci-clang16-windows'
be1549d950 ci: Enable C++ modules tests with LLVM/Clang 16.0 on Windows
eb93e1ff18 ci: Update LLVM/Clang to 16.0 in nightly CI jobs on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8350
2023-03-21 09:17:08 -04:00
Brad King
effed24df8 Merge topic 'update-curl'
eca41c0243 curl: Restore build within CMake after update to 8.0.1
e3dc4df9b9 Merge branch 'upstream-curl' into update-curl
e8bff971d9 curl 2023-03-20 (b16d1fa8)
4e6c3cd93b curl: Update script to get curl 8.0.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !8351
2023-03-21 09:13:54 -04:00
Brad King
2ae6aeacb1 Actually remove unused top-level doxygen.config file
In commit 3ca1a80e53 (Remove unused top-level doxygen.config file,
2023-03-20) we only removed the content, not the file itself.
2023-03-21 09:08:59 -04:00
Brad King
1fad396db7 Merge topic 'remove-doxygen.config'
3ca1a80e53 Remove unused top-level doxygen.config file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8349
2023-03-21 09:07:48 -04:00
Brad King
cb41fc469b Merge topic 'autogen-parallel-number'
a42ecb1614 Autogen: Restore AUTOGEN_PARALLEL support for numbers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8336
2023-03-21 09:06:52 -04:00
Brad King
926501c42a Merge topic 'file-REAL_PATH'
1d12853ed3 file(REAL_PATH): Ensure same behavior as get_filename_component(REALPATH)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !8348
2023-03-21 09:05:56 -04:00
Brad King
e05dcdf246 Merge topic 'find_package-raii-fc-early-return'
716ce4402a find_package: Ensure root path stack and module vars are restored

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8339
2023-03-21 09:04:40 -04:00
Brad King
fb767b8910 Merge topic 'FindCUDATooklit-mark-as-advanced'
9be0063d98 FindCUDAToolkit: mark a few variables as advanced

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !8343
2023-03-21 09:03:24 -04:00
Brad King
be1549d950 ci: Enable C++ modules tests with LLVM/Clang 16.0 on Windows
This works only with the GNU-like front-end and the Ninja generator.
2023-03-21 09:00:03 -04:00
Brad King
eb93e1ff18 ci: Update LLVM/Clang to 16.0 in nightly CI jobs on Windows 2023-03-21 09:00:03 -04:00
Brad King
e57bbae0b0 Merge branch 'release-3.26' 2023-03-21 08:58:43 -04:00
Brad King
ca8c171021 Merge topic 'clang-windows-cxx-modules'
1b7c26da49 Ninja: Wrap rules using '>' shell redirection with 'cmd /C' on Windows
ffd8537acf Clang: Record Clang 16.0 C++ modules flags only for GNU-like front-end
6013227230 cmGlobalNinjaGenerator: Use forward slashes in clang modmap format on Windows
d9d74b5e8a cmDyndepCollation: Drop outdated mentions of CXX_MODULE_INTERNAL_PARTITIONS
edab56d29a cmLocalNinjaGenerator: De-duplicate condition for using 'cmd /C' on Windows
8ebe3f92b3 cmGlobalNinjaGenerator: Detect GNU-like command-line for dyndep collator
f3ca199c9b cmGlobalNinjaGenerator: Factor out GNU-like command-line detection on Windows
f79817fcf0 cmCxxModuleMapper: Use value semantics in path conversion callback
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8346
2023-03-21 08:58:43 -04:00
Brad King
15a86d45d1 Merge topic 'clang-windows-cxx-modules' into release-3.26
1b7c26da49 Ninja: Wrap rules using '>' shell redirection with 'cmd /C' on Windows
ffd8537acf Clang: Record Clang 16.0 C++ modules flags only for GNU-like front-end
6013227230 cmGlobalNinjaGenerator: Use forward slashes in clang modmap format on Windows
d9d74b5e8a cmDyndepCollation: Drop outdated mentions of CXX_MODULE_INTERNAL_PARTITIONS
edab56d29a cmLocalNinjaGenerator: De-duplicate condition for using 'cmd /C' on Windows
8ebe3f92b3 cmGlobalNinjaGenerator: Detect GNU-like command-line for dyndep collator
f3ca199c9b cmGlobalNinjaGenerator: Factor out GNU-like command-line detection on Windows
f79817fcf0 cmCxxModuleMapper: Use value semantics in path conversion callback
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8346
2023-03-21 08:58:42 -04:00
Brad King
5f8929f721 Merge branch 'release-3.26' 2023-03-21 08:57:35 -04:00
Brad King
2cdb0bae28 Merge topic 'clang-cl-showIncludes'
843fc607de Ninja: Restore detection of clang-cl showIncludes prefix
3346570ae9 Tests: Comment RunCMake.Ninja ShowIncludes sample input languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8344
2023-03-21 08:57:35 -04:00
Brad King
90d90a5d91 Merge topic 'clang-cl-showIncludes' into release-3.26
843fc607de Ninja: Restore detection of clang-cl showIncludes prefix
3346570ae9 Tests: Comment RunCMake.Ninja ShowIncludes sample input languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8344
2023-03-21 08:57:34 -04:00
Brad King
3bab70b5ab Merge branch 'release-3.26' 2023-03-21 08:56:07 -04:00
Brad King
4b9bf10c4d Merge topic 'FindPython-SOSABI-handling'
8a71c88d4d Merge branch 'backport-3.26-FindPython-SOSABI-handling'
4c902d675b FindPython: ensure Stable ABI is correctly handled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8345
2023-03-21 08:56:07 -04:00
Brad King
bf6131fc9a Merge topic 'FindPython-SOSABI-handling' into release-3.26
4c902d675b FindPython: ensure Stable ABI is correctly handled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8345
2023-03-21 08:56:06 -04:00
Kitware Robot
88efbdab5f CMake Nightly Date Stamp 2023-03-21 00:01:11 -04:00
Brad King
eca41c0243 curl: Restore build within CMake after update to 8.0.1
Restore changes from commit 2be5a7de4e (Build: Use imported target
`ZLIB::ZLIB` instead of variables, 2022-08-21, v3.25.0-rc1~97^2~10)
that were undone by the update to curl 8.0.1.  The code was moved.
2023-03-20 16:42:25 -04:00
Brad King
e3dc4df9b9 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2023-03-20 (b16d1fa8)
2023-03-20 16:40:49 -04:00
Curl Upstream
e8bff971d9 curl 2023-03-20 (b16d1fa8)
Code extracted from:

    https://github.com/curl/curl.git

at commit b16d1fa8ee567b52c09a0f89940b07d8491b881d (curl-8_0_1).
2023-03-20 16:39:46 -04:00
Brad King
4e6c3cd93b curl: Update script to get curl 8.0.1 2023-03-20 15:56:55 -04:00
Brad King
1b7c26da49 Ninja: Wrap rules using '>' shell redirection with 'cmd /C' on Windows
This is needed for the clang-scan-deps rule added by commit 0e21e55fc5
(Clang: Record Clang 16.0 C++ modules flags only for GNU-like front-end,
2023-03-16).

Fixes: #24611
2023-03-20 13:13:30 -04:00
Brad King
ffd8537acf Clang: Record Clang 16.0 C++ modules flags only for GNU-like front-end
The settings added by commit 3fe8e33f27 (Clang: Record Clang 16.0 flags
for our experimental C++ modules support, 2023-03-03, v3.26.0-rc6~6^2)
work only for the GNU-like `clang++` front-end, and not for the
MSVC-like `clang-cl` on Windows.

Also quote the path to `clang-scan-deps` to support spaces in its path.

Issue: #24611
2023-03-20 13:13:08 -04:00
Orkun Tokdemir
a42ecb1614 Autogen: Restore AUTOGEN_PARALLEL support for numbers
Refactoring in commit d867e05892 (Autogen: Use JSON instead of CMake
script for info files, 2019-09-20, v3.16.0-rc1~57^2) broke support for
numerical values of `AUTOGEN_PARALLEL`.  Parse and verify the range.
Warn if the value is invalid.

Fixes: #20376
2023-03-20 12:10:01 -04:00
YR Chen
843fc607de Ninja: Restore detection of clang-cl showIncludes prefix
Since commit 8f82e755f3 (Ninja: Fix detection of MSVC showIncludes
prefix in Italian, 2023-01-26, v3.26.0-rc1~20^2) our regex no longer
matches the output from `clang-cl`, which uses a relative path, forward
slashes, and is always in English [1]:

    Note: including file: ./foo.h

Update the regex to match that too.

[1] https://github.com/llvm/llvm-project/blob/llvmorg-16.0.0/clang/lib/Frontend/HeaderIncludeGen.cpp#L102

Co-authored-by: Brad King <brad.king@kitware.com>
2023-03-20 10:08:25 -04:00
Brad King
3346570ae9 Tests: Comment RunCMake.Ninja ShowIncludes sample input languages 2023-03-20 10:05:57 -04:00
Abdalalah M
3ca1a80e53 Remove unused top-level doxygen.config file
CMake's own doxygen config is in `Utilities/Doxygen/doxyfile.in`.
See commit c18dc6fbe5 (Added CMake_BUILD_DEVELOPER_REFERENCE option,
2016-08-04, v3.7.0-rc1~251^2~1).
2023-03-20 09:24:20 -04:00
Marc Chevrier
1d12853ed3 file(REAL_PATH): Ensure same behavior as get_filename_component(REALPATH)
Fixes: #24605
2023-03-20 14:14:11 +01:00
Brad King
8a71c88d4d Merge branch 'backport-3.26-FindPython-SOSABI-handling' 2023-03-20 08:11:56 -04:00
Marc Chevrier
4c902d675b FindPython: ensure Stable ABI is correctly handled
Fixes: #24610
2023-03-20 08:10:53 -04:00
Brad King
1f0aa05317 Merge topic 'ci-linkcheck'
301279e4a9 Help: Replace link with its permanent redirect

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8340
2023-03-20 07:52:29 -04:00
Kitware Robot
d0cc1d9bf9 CMake Nightly Date Stamp 2023-03-20 00:01:27 -04:00
Kitware Robot
54d64dc6dd CMake Nightly Date Stamp 2023-03-19 00:01:09 -04:00
Brad King
6013227230 cmGlobalNinjaGenerator: Use forward slashes in clang modmap format on Windows
Issue: #24611
2023-03-18 11:52:42 -04:00
Brad King
d9d74b5e8a cmDyndepCollation: Drop outdated mentions of CXX_MODULE_INTERNAL_PARTITIONS
These were left from an older design iteration in which, for MSVC, we
needed to distinguish `cl -internalPartition` from `cl -interface`
before scanning.  It is no longer needed since `cl -scanDependencies`
was updated to use the standard-conforming interpretation of
non-exported module partition syntax.

Issue: #24611
2023-03-18 11:52:42 -04:00
Brad King
edab56d29a cmLocalNinjaGenerator: De-duplicate condition for using 'cmd /C' on Windows 2023-03-18 11:52:41 -04:00
Brad King
8ebe3f92b3 cmGlobalNinjaGenerator: Detect GNU-like command-line for dyndep collator
This will help the collator choose flags and path styles for modmap
files.
2023-03-18 11:52:41 -04:00
Brad King
f3ca199c9b cmGlobalNinjaGenerator: Factor out GNU-like command-line detection on Windows 2023-03-18 11:52:41 -04:00
Brad King
f79817fcf0 cmCxxModuleMapper: Use value semantics in path conversion callback
The call site already owns a path it doesn't need when the callback
returns.  Hand ownership to the callback so it can optionally mutate
the path without necessarily allocating.
2023-03-18 11:52:41 -04:00
Brad King
5ab002ea11 cmCxxModuleMapper: Remove redundant path conversion callbacks
Two calls to `PathForGenerator` were applied to values returned by
`BmiGeneratorPathForModule`, that already calls `PathForGenerator`.
2023-03-18 11:52:41 -04:00
Brad King
301279e4a9 Help: Replace link with its permanent redirect 2023-03-18 08:46:12 -04:00
Kitware Robot
c3110a500e CMake Nightly Date Stamp 2023-03-18 00:01:21 -04:00
Andrey Alekseenko
9be0063d98 FindCUDAToolkit: mark a few variables as advanced
- CUDAToolkit_BIN_DIR (was already "advanced" sometimes)
- CUDAToolkit_CUPTI_INCLUDE_DIR
2023-03-18 00:55:24 +01:00
Brad King
6741acdeb4 Merge topic 'iar-version-correction'
9df52c7f1c IAR: Version update for arm assembler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8332
2023-03-17 08:07:13 -04:00