summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmGeneratorExpressionNode: Fix short-circuit logicMartin Duffy2023-11-133-1/+6
| | | | | | | | Fix logic added by commit 634079b86d (cmGeneratorExpressionEvaluator: Short-circuit boolean operators, 2023-09-11, v3.28.0-rc1~47^2) and add missing test cases. Fixes: #25412
* Merge topic 'find_cudatoolkit_cufile_name' into release-3.28Brad King2023-11-091-4/+4
|\ | | | | | | | | | | | | b38a8e77cb FindCUDAToolkit: Search for cufile library name being lowercase Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8955
| * FindCUDAToolkit: Search for cufile library name being lowercaseRobert Maynard2023-11-081-4/+4
|/ | | | Fixes #25398
* Merge topic 'cxx23' into release-3.28Brad King2023-11-086-14/+17
|\ | | | | | | | | | | | | | | | | | | | | | | a0fabc4769 cmGlobalGeneratorFactory: Provide complete cmGlobalGenerator to deleter 85627a93c9 cmCTestBuildCommand: Avoid requiring complete cmGlobalGenerator type publicly 641c02a3ce cmList: Avoid using operator-> on input iterator e4483b8871 Tests: Avoid compiling call to dap::optional<dap::string>(nullptr) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !8950
| * cmGlobalGeneratorFactory: Provide complete cmGlobalGenerator to deleterBrad King2023-11-071-1/+1
| | | | | | | | | | | | The libc++ `unique_ptr` implementation requires this since C++23. Fixes: #25388
| * cmCTestBuildCommand: Avoid requiring complete cmGlobalGenerator type publiclyBrad King2023-11-072-9/+12
| |
| * cmList: Avoid using operator-> on input iteratorBrad King2023-11-071-1/+1
| | | | | | | | As of C++23, some standard library iterator types deprecate it.
| * Tests: Avoid compiling call to dap::optional<dap::string>(nullptr)Brad King2023-11-072-3/+3
| |
* | Merge topic 'static-library-link-xcframework' into release-3.28Brad King2023-11-074-21/+84
|\ \ | |/ |/| | | | | | | | | 7d19246138 Xcode: Fix linking against .xcframework from static libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8949
| * Xcode: Fix linking against .xcframework from static librariesKyle Edwards2023-11-064-21/+84
| | | | | | | | Issue: #21752
* | CMake 3.28.0-rc4v3.28.0-rc4Brad King2023-11-061-1/+1
|/
* Merge topic 'cdash-report-urls' into release-3.28Brad King2023-11-038-3/+112
|\ | | | | | | | | | | | | | | | | 06661b1e4c gitlab-ci: pull annotations for CDash from the jobs a518e402c5 ci: generate annotation reports Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8939
| * gitlab-ci: pull annotations for CDash from the jobsBen Boeckel2023-11-022-0/+28
| | | | | | | | Only move `cdash-build-id` between stages that make sense.
| * ci: generate annotation reportsBen Boeckel2023-11-026-3/+84
| | | | | | | | | | | | These will render links in the sidebar for each job. See: https://docs.gitlab.com/ee/ci/yaml/artifacts_reports.html#artifactsreportsannotations
* | Merge topic 'cmsystemtools-runsinglecommand-stdin' into release-3.28Kyle Edwards2023-11-035-2/+11
|\ \ | |/ |/| | | | | | | | | | | c4be9c914b cmSystemTools::RunSingleCommand(): Pass stdin to child process Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8941
| * cmSystemTools::RunSingleCommand(): Pass stdin to child processKyle Edwards2023-11-025-2/+11
|/ | | | Fixes: #25383
* Merge topic 'cuda-vs' into release-3.28Brad King2023-11-023-20/+6
|\ | | | | | | | | | | | | | | | | | | 79f3f29e50 CUDA: Parse NVCC implicit compile/link information in Visual Studio generators 27e64a8498 CMakeNVCCParseImplicitInfo: Recognize link.exe line in CUDA VS integration 045399a461 CMakeParseImplicitLinkInfo: Ignore MSVC link /implib: flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Merge-request: !8938
| * CUDA: Parse NVCC implicit compile/link information in Visual Studio generatorsBrad King2023-11-011-20/+1
| | | | | | | | | | | | | | | | | | | | | | Refactoring in commit deff0e638d (CUDA: Factor out helper to parse NVCC implicit compiler and linker flags, 2023-09-15, v3.28.0-rc1~63^2~6) incorrectly dropped detection of the default CUDA architecture and the CUDA toolkit include directories from the code path used for Visual Studio generators. However, CMakeNVCCParseImplicitInfo is now general enough that we no longer need a VS-specific code path. Fixes: #25378
| * CMakeNVCCParseImplicitInfo: Recognize link.exe line in CUDA VS integrationBrad King2023-11-011-0/+3
| |
| * CMakeParseImplicitLinkInfo: Ignore MSVC link /implib: flagBrad King2023-11-011-0/+2
| | | | | | | | | | The flag specifies the import library for the linked binary. It is not a linked library.
* | Merge topic 'cxxmodules-cmp0155-graceful-fallback-without-scanner' into ↵Brad King2023-11-0114-30/+54
|\ \ | |/ |/| | | | | | | | | | | | | | | | | release-3.28 1f507580a1 cmGlobalGenerator: give context about module queries 889aa0354a CMP0155: ignore scanning for sources if no scanner is available Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8925
| * cmGlobalGenerator: give context about module queriesBen Boeckel2023-11-015-8/+22
| | | | | | | | | | | | Some queries are merely investigating support in order to change behavior. Let the method know so that any internal errors can be skipped over.
| * CMP0155: ignore scanning for sources if no scanner is availableBen Boeckel2023-11-0110-23/+33
| | | | | | | | | | | | | | | | | | | | This allows for a more graceful transition for projects using C++20 without scanner support (e.g., Clang 15 or GCC 13). While newer compilers will (needlessly) scan, it allows C++20-using projects to use older compilers without having to set `CMAKE_CXX_SCAN_FOR_MODULES` to support newer CMake minimum versions. Fixes: #25357
* | Merge topic 'ctest-windows-color' into release-3.28Brad King2023-11-011-10/+5
|\ \ | | | | | | | | | | | | | | | | | | 2553a78aa7 ctest: Allow colored output on Windows if CLICOLOR_FORCE is set to 1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8932
| * | ctest: Allow colored output on Windows if CLICOLOR_FORCE is set to 1Cristian Adam2023-11-011-10/+5
|/ / | | | | | | | | | | | | | | Windows 10 supports ANSI colors since v1511. For earlier versions of Windows installing ANSICON will enable ANSI colors in cmd.exe. For those setups where the environment is set up with CLICOLOR_FORCE set to 1 ctest should honor the setting and emit colored ANSI output.
* | Merge branch 'release-3.27' into release-3.28Brad King2023-11-010-0/+0
|\ \
| * \ Merge branch 'revert-GetPrerequisites-linux-x86' into release-3.27Brad King2023-11-011-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !8933
* | \ \ Merge topic 'revert-GetPrerequisites-linux-x86' into release-3.28Brad King2023-11-011-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 139df0bc2f GetPrerequisites: Revert "Ignore relative paths printed by ldd" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8933
| * | | GetPrerequisites: Revert "Ignore relative paths printed by ldd"Brad King2023-10-311-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Revert commit cf2ad9995a (GetPrerequisites: Ignore relative paths printed by ldd, 2023-02-20, v3.27.0-rc1~459^2) because it regressed existing use cases. We will need to find another solution to the use case motivating the change. Fixes: #25372
* | | Merge branch 'release-3.27' into release-3.28Brad King2023-10-310-0/+0
|\ \ \ | |/ /
| * | Merge branch 'modules-depends-via-target-objects' into release-3.27Brad King2023-10-3111-2/+90
| |\ \ | | | | | | | | | | | | Merge-request: !8923
* | \ \ Merge topic 'modules-depends-via-target-objects' into release-3.28Brad King2023-10-3111-2/+90
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22da18b995 Fortran: Restore support for TARGET_OBJECTS providing modules 64d9240564 cmComputeLinkInformation: skip over linking to items for object purposes 035302b7e3 cmComputeLinkDepends: also copy the target from object link items 861876b936 Tests/ObjectLibrary: fix comment Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !8923
| * | | Fortran: Restore support for TARGET_OBJECTS providing modulesBen Boeckel2023-10-309-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continue b665966933 (cmComputeLinkInformation: track OBJECT library dependencies, 2023-07-22) which added explicitly listed `OBJECT` libraries to the list of targets which the collator needs to consider. Now also consider targets which provide objects directly to the target via a `$<TARGET_OBJECT>` source lists. Also add tests which use target objects directly and through an `INTERFACE` library with target objects in its own sources. Fixes: #25365
| * | | cmComputeLinkInformation: skip over linking to items for object purposesBen Boeckel2023-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | If a name is only found because it is a link entry of kind `Object`, do not add anything to the link line.
| * | | cmComputeLinkDepends: also copy the target from object link itemsBen Boeckel2023-10-271-0/+1
| | | |
| * | | Tests/ObjectLibrary: fix commentBen Boeckel2023-10-271-1/+1
| | | |
* | | | Merge topic 'FindFreeType-config-windows' into release-3.28Brad King2023-10-311-2/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0117446c97 FindFreeType: also set `FREETYPE_FOUND` 2cf2d4f7df FindFreeType: insert Freetype's location to the start 1cfc708eea FindFreeType: handle config-specific `LOCATION` settings as well ae9890cd36 FindFreeType: consider `IMPLIB`-using platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8920
| * | | | FindFreeType: also set `FREETYPE_FOUND`Ben Boeckel2023-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | Fixes: #25371
| * | | | FindFreeType: insert Freetype's location to the startBen Boeckel2023-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This should help static builds satisfy dependencies by listing transitive libraries after freetype's.
| * | | | FindFreeType: handle config-specific `LOCATION` settings as wellBen Boeckel2023-10-281-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | `vcpkg` builds release and debug variants on platforms other than Windows (which uses the `IMPLIB` properties).
| * | | | FindFreeType: consider `IMPLIB`-using platformsBen Boeckel2023-10-261-1/+18
| | |_|/ | |/| | | | | | | | | | See: https://github.com/microsoft/vcpkg/issues/34725
* | | | Merge topic 'cxxmodules-ninja-forced-rsp-files' into release-3.28Brad King2023-10-304-2/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09c962a6a4 Tests/CXXModules: test forced rsp files with ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8926
| * | | | Tests/CXXModules: test forced rsp files with ninjaBen Boeckel2023-10-284-2/+52
| |/ / / | | | | | | | | | | | | Fixes: #25367
* | | | Merge topic 'cmp0153-suggestion' into release-3.28Brad King2023-10-305-11/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3cc815c98 CMP0153: Add suggestion to use execute_process() 8313d26198 cmState::AddDisallowedCommand(): Allow additional warning info Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !8921
| * | | | CMP0153: Add suggestion to use execute_process()Kyle Edwards2023-10-273-4/+9
| | | | |
| * | | | cmState::AddDisallowedCommand(): Allow additional warning infoKyle Edwards2023-10-272-7/+14
| |/ / /
* | | | Merge topic 'FindProtobuf-restore-protoc-include-path' into release-3.28Brad King2023-10-301-4/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | d7f7bf08cd FindProtobuf: Fix protoc include path regression Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Matias Lopez <mlopez203@bloomberg.net> Merge-request: !8922
| * | | FindProtobuf: Fix protoc include path regressionAndré Apitzsch2023-10-271-4/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | This was accidentally broken by commit 31adc11030 (FindProtobuf: Add PLUGIN_OPTIONS and PROTOC_OPTIONS to protobuf_generate, 2023-06-29, v3.28.0-rc1~409^2~2). Fixes: #25368
* | | CMake 3.28.0-rc3v3.28.0-rc3Brad King2023-10-241-1/+1
| | |
* | | Merge topic 'cmcldeps-quote-rc' into release-3.28Brad King2023-10-241-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 03080d18eb cmcldeps: Restore support for rc.exe path not fully GetShortPathName-d Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8912
generated by cgit v0.12 at 2025-01-10 05:45:14 (GMT)