summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'file-GET_RUNTIME_DEPENDENCIES-windows-casing'Brad King2023-03-247-11/+82
|\ | | | | | | | | | | | | | | | | fa45594407 file(GET_RUNTIME_DEPENDENCIES): Preserve casing for Windows PE binaries 14cfd6a1eb Tests: Add test for file(GET_RUNTIME_DEPENDENCIES) with MixedCase.dll Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8291
| * file(GET_RUNTIME_DEPENDENCIES): Preserve casing for Windows PE binariesChristian Heimlich2023-03-236-11/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Windows PE files the `file(GET_RUNTIME_DEPENDENCIES)` command converts the name of all DLLs found during binary scanning to lowercase in order to simplify the syntax requirements of its regex filters; however, this has the side-effect of causing all DLL paths returned via RESOLVED_DEPENDENCIES_VAR to be in lowercase, regardless of their actual casing. Instead, respect the original casing as closely as possible when returning resolved dependencies after all filters have been passed: When evaluating a Windows PE format binary on a non-Windows host the casing of dependencies recorded within the binary are used. When the host is running Windows, the actual casing of the dependencies on-disk are used instead. Fixes: #23091
| * Tests: Add test for file(GET_RUNTIME_DEPENDENCIES) with MixedCase.dllChristian Heimlich2023-03-232-1/+5
| | | | | | | | Issue: #23091
* | CMake Nightly Date StampKitware Robot2023-03-241-1/+1
| |
* | Merge branch 'release-3.26'Brad King2023-03-231-0/+12
|\ \
| * | CMake 3.26.1v3.26.1Brad King2023-03-232-1/+13
| | |
* | | Merge topic 'autogen-exe-vars'Brad King2023-03-2310-0/+81
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b3d1797508 Autogen: Add CMAKE_AUTO*_EXECUTABLE variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8352
| * | | Autogen: Add CMAKE_AUTO*_EXECUTABLE variablesOrkun Tokdemir2023-03-2210-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the `CMAKE_AUTOMOC_EXECUTABLE`, `CMAKE_AUTOUIC_EXECUTABLE`, and `CMAKE_AUTORCC_EXECUTABLE` variables to initialize the corresponding `AUTO{MOC,UIC,RCC}_EXECUTABLE` target properties. Fixes: #20071
* | | | Merge branch 'release-3.26'Brad King2023-03-230-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'FindHDF5-CXX-without-C' into release-3.26Brad King2023-03-231-38/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6bb4975ab FindHDF5: Restore parallel HDF5 detection with only CXX enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8355
* | \ \ \ Merge topic 'FindHDF5-CXX-without-C'Brad King2023-03-231-38/+28
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a6bb4975ab FindHDF5: Restore parallel HDF5 detection with only CXX enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8355
| * | | | FindHDF5: Restore parallel HDF5 detection with only CXX enabledBrad King2023-03-221-38/+28
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 14c46fb16a (FindHDF5: Find C component with only CXX compiler, 2022-12-13, v3.26.0-rc1~175^2), if CXX is enabled but C is not, the `_HDF5_test_regular_compiler_C` helper writes a `.cpp` source but the `_HDF5_invoke_compiler` still expects a `.c` source. Refactor the logic to select a name for the source file up front, and use it in both helpers. Fixes: #24627 Issue: #24241
* | | | CMake Nightly Date StampKitware Robot2023-03-231-1/+1
| | | |
* | | | Merge topic 'remove-doxygen.config'Brad King2023-03-221-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ae6aeacb1 Actually remove unused top-level doxygen.config file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8353
| * | | | Actually remove unused top-level doxygen.config fileBrad King2023-03-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | In commit 3ca1a80e53 (Remove unused top-level doxygen.config file, 2023-03-20) we only removed the content, not the file itself.
* | | | | CMake Nightly Date StampKitware Robot2023-03-221-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'ci-clang16-windows'Brad King2023-03-213-13/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | ci: Enable C++ modules tests with LLVM/Clang 16.0 on WindowsBrad King2023-03-211-0/+4
| | | | | | | | | | | | | | | | | | | | This works only with the GNU-like front-end and the Ninja generator.
| * | | | ci: Update LLVM/Clang to 16.0 in nightly CI jobs on WindowsBrad King2023-03-212-13/+13
| | | | |
* | | | | Merge topic 'update-curl'Brad King2023-03-2177-1539/+1939
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | curl: Restore build within CMake after update to 8.0.1Brad King2023-03-201-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Merge branch 'upstream-curl' into update-curlBrad King2023-03-2076-1538/+1934
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2023-03-20 (b16d1fa8)
| | * | | | | curl 2023-03-20 (b16d1fa8)Curl Upstream2023-03-2076-1537/+1934
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit b16d1fa8ee567b52c09a0f89940b07d8491b881d (curl-8_0_1).
| * | | | | | curl: Update script to get curl 8.0.1Brad King2023-03-201-1/+1
| | | | | | |
* | | | | | | Merge topic 'remove-doxygen.config'Brad King2023-03-211-696/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ca1a80e53 Remove unused top-level doxygen.config file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8349
| * | | | | | Remove unused top-level doxygen.config fileAbdalalah M2023-03-201-696/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | | Merge topic 'autogen-parallel-number'Brad King2023-03-211-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a42ecb1614 Autogen: Restore AUTOGEN_PARALLEL support for numbers Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8336
| * | | | | | | Autogen: Restore AUTOGEN_PARALLEL support for numbersOrkun Tokdemir2023-03-201-0/+12
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge topic 'file-REAL_PATH'Brad King2023-03-212-4/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | file(REAL_PATH): Ensure same behavior as get_filename_component(REALPATH)Marc Chevrier2023-03-202-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #24605
* | | | | | | | Merge topic 'find_package-raii-fc-early-return'Brad King2023-03-212-12/+55
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | find_package: Ensure root path stack and module vars are restoredCraig Scott2023-03-172-12/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #24595
* | | | | | | | | Merge topic 'FindCUDATooklit-mark-as-advanced'Brad King2023-03-211-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | FindCUDAToolkit: mark a few variables as advancedAndrey Alekseenko2023-03-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CUDAToolkit_BIN_DIR (was already "advanced" sometimes) - CUDAToolkit_CUPTI_INCLUDE_DIR
* | | | | | | | | Merge branch 'release-3.26'Brad King2023-03-210-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge topic 'clang-windows-cxx-modules' into release-3.26Brad King2023-03-218-76/+96
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ \ \ Merge topic 'clang-windows-cxx-modules'Brad King2023-03-218-76/+96
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Ninja: Wrap rules using '>' shell redirection with 'cmd /C' on WindowsBrad King2023-03-201-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Clang: Record Clang 16.0 C++ modules flags only for GNU-like front-endBrad King2023-03-201-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | cmGlobalNinjaGenerator: Use forward slashes in clang modmap format on WindowsBrad King2023-03-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #24611
| * | | | | | | | | cmDyndepCollation: Drop outdated mentions of CXX_MODULE_INTERNAL_PARTITIONSBrad King2023-03-181-38/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | cmLocalNinjaGenerator: De-duplicate condition for using 'cmd /C' on WindowsBrad King2023-03-181-5/+5
| | | | | | | | | |
| * | | | | | | | | cmGlobalNinjaGenerator: Detect GNU-like command-line for dyndep collatorBrad King2023-03-182-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help the collator choose flags and path styles for modmap files.
| * | | | | | | | | cmGlobalNinjaGenerator: Factor out GNU-like command-line detection on WindowsBrad King2023-03-182-6/+16
| | | | | | | | | |
| * | | | | | | | | cmCxxModuleMapper: Use value semantics in path conversion callbackBrad King2023-03-183-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | cmCxxModuleMapper: Remove redundant path conversion callbacksBrad King2023-03-181-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two calls to `PathForGenerator` were applied to values returned by `BmiGeneratorPathForModule`, that already calls `PathForGenerator`.
* | | | | | | | | | Merge branch 'release-3.26'Brad King2023-03-210-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'clang-cl-showIncludes' into release-3.26Brad King2023-03-216-1/+23
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ \ \ \ Merge topic 'clang-cl-showIncludes'Brad King2023-03-216-1/+23
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Ninja: Restore detection of clang-cl showIncludes prefixYR Chen2023-03-206-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v0.12 at 2025-01-06 22:02:08 (GMT)