summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ExternalProject: Add `INSTALL_BYPRODUCTS` optionAlois Klink2022-11-054-0/+54
| | | | | | | | | | | | | | | Add an `INSTALL_BYPRODUCTS` option to `ExternalProject_Add` that can be used to declare that files are `BYPRODUCTS` of the ExternalProject install step. This is often required by the Ninja generator to explicitly declare dependencies. Previously, many users used `BUILD_BYPRODUCTS`, even if their files were created by the install step, not the build step. This commit essentially just copies the code for `BUILD_BYPRODUCTS`. Fixes: #24120 Fixes: #23056
* Tests: Fix ExternalLibraryWithSubstitution testAlois Klink2022-11-032-0/+11
| | | | | | | | | | | | The ExternalLibraryWithSubstitution test should test whether BUILD_BYPRODUCTS supports <BUILD_DIR> and other ExternalProject placeholder tokens. However, it's not hooked up correctly, and therefore isn't properly tested. This commit links it to an executable, to confirm whether it's possible to use the BUILD_BYPRODUCT in the Ninja generator. Fixes: commit 86032ae0eb (ExternalProject: Replace placeholder tokens in BYPRODUCTS, 2015-03-06)
* ExternalProject: Clarify `BYPRODUCTS` docsAlois Klink2022-11-031-4/+10
| | | | | | | | | | Clarify that the `BUILD_BYPRODUCTS` and `BYPRODUCTS` options in ExternalProject may also be required when using the Ninja generator (as that's one of the primary reasons why you'd want to use those options). I've also mentioned that `add_custom_command` has additional documentation on what `BYPRODUCTS` does.
* Merge branch 'release-3.25'Brad King2022-11-030-0/+0
|\
| * Merge topic 'ci-swift-5.7' into release-3.25Brad King2022-11-031-4/+4
| |\ | | | | | | | | | | | | | | | | | | 48ea2ce504 ci: Update debian10-ninja job to use Swift 5.7.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7860
* | \ Merge topic 'ci-swift-5.7'Brad King2022-11-031-4/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 48ea2ce504 ci: Update debian10-ninja job to use Swift 5.7.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7860
| * | ci: Update debian10-ninja job to use Swift 5.7.1Brad King2022-11-021-4/+4
| | |
* | | Merge branch 'release-3.25'Brad King2022-11-030-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'correct_nvptxcompiler_not_linking_to_threads' into release-3.25Brad King2022-11-035-2/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 62f13ed588 FindCUDAToolkit: Restore usage from multiple directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7859
* | \ \ Merge topic 'correct_nvptxcompiler_not_linking_to_threads'Brad King2022-11-035-2/+37
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 62f13ed588 FindCUDAToolkit: Restore usage from multiple directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7859
| * | | FindCUDAToolkit: Restore usage from multiple directoriesRobert Maynard2022-11-025-2/+37
| | | | | | | | | | | | | | | | Fixes #24119
* | | | Merge branch 'release-3.25'Brad King2022-11-030-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'xcode-swift-include-dirs' into release-3.25Brad King2022-11-036-10/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb4e6702b2 Xcode: Implement Swift include directories e1ccab12d7 Xcode: Restore Swift framework search directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7858
* | \ \ \ Merge topic 'xcode-swift-include-dirs'Brad King2022-11-036-10/+23
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | cb4e6702b2 Xcode: Implement Swift include directories e1ccab12d7 Xcode: Restore Swift framework search directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7858
| * | | | Xcode: Implement Swift include directoriesBrad King2022-11-026-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Populate Xcode's `SWIFT_INCLUDE_PATHS` build setting with the target-wide include directories. Issue: #24116
| * | | | Xcode: Restore Swift framework search directoriesBrad King2022-11-021-10/+12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we selected a single "language for preprocessor" with which to compute both target-wide `GCC_PREPROCESSOR_DEFINITIONS` and `{HEADER,FRAMEWORK}_SEARCH_PATHS`. Since commit c0dd3dd2c1 (Xcode: Evaluate Swift compile definitions separately, 2022-10-25, v3.25.0-rc3~16^2) we never compute `GCC_PREPROCESSOR_DEFINITIONS` for Swift. Therefore we need to select the language for target-wide include and framework directories separately. Fixes: #24116
* | | | Merge topic 'ci-mingw'Brad King2022-11-0314-7/+117
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3624295c9b ci: add MSYS Makefiles nightly CI job 01c58daec7 ci: add MinGW Makefiles nightly CI job 88b14c5cf4 Tests: Improve GeneratorExpression SHELL_PATH case robustness on MSYS 1.0 82c990e9be Tests: Improve RunCMake.GetPrerequisites sample executable selection Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7861
| * | | | ci: add MSYS Makefiles nightly CI jobBrad King2022-11-025-0/+29
| | | | | | | | | | | | | | | | | | | | Use the MinGW/MSYS 1.0 distribution from `mingw.osdn.io`.
| * | | | ci: add MinGW Makefiles nightly CI jobBrad King2022-11-027-0/+63
| | | | | | | | | | | | | | | | | | | | Use the MinGW/MSYS 1.0 distribution from `mingw.osdn.io`.
| * | | | Tests: Improve GeneratorExpression SHELL_PATH case robustness on MSYS 1.0Brad King2022-11-022-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit ca6ba3fee5 (Genex: Add a SHELL_PATH expression, 2015-09-24, v3.4.0-rc1~37^2) and commit 21da25d2a8 (Tests: Generalize GeneratorExpression MSYS path conversion workaround, 2019-03-11, v3.15.0-rc1~407^2~1) we use a prefix string to prevent the MSYS 1.0 shell from converting absolute paths of the form `/c/...` to windows-style paths. In the newer `mingw.osdn.io` distribution of MSYS 1.0, the `bash` shell now also converts paths that appear after `:`. We have no way to add a prefix string in that context, so perform the test's check of the `SHELL_PATH` genex value at generate time instead.
| * | | | Tests: Improve RunCMake.GetPrerequisites sample executable selectionBrad King2022-11-023-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get the runtime dependencies of an executable just built by the toolchain with which tests are running. Previously we used the `cmake` binary itself, but that might have been built for a different ABI than the tested binutils support.
* | | | | CMake Nightly Date StampKitware Robot2022-11-031-1/+1
|/ / / /
* | | | Merge branch 'release-3.25'Brad King2022-11-020-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'IAR-CXX-fix' into release-3.25Brad King2022-11-021-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 73e84a392b IAR: Restore support for CMAKE_CXX_FLAGS_INIT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7857
* | | | Merge topic 'IAR-CXX-fix'Brad King2022-11-021-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 73e84a392b IAR: Restore support for CMAKE_CXX_FLAGS_INIT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7857
| * | | IAR: Restore support for CMAKE_CXX_FLAGS_INITDaniel Schürmann2022-11-011-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit a9073db736 (IAR: update language specification detection, 2021-09-23, v3.22.0-rc1~83^2) the `--c++`/`--eec++` flags were stored in `CMAKE_IAR_CXX_FLAG` so that they would be used as part of the `CMAKE_CXX_COMPILE_OBJECT` rule variable. That commit moved the flags to `CMAKE_CXX_FLAGS`, which also broke initialization of `CMAKE_CXX_FLAGS` from `CMAKE_CXX_FLAGS_INIT`. Restore the original approach. Fixes: #24111
* | | CMake Nightly Date StampKitware Robot2022-11-021-1/+1
| | |
* | | Merge branch 'release-3.25'Brad King2022-11-010-0/+0
|\ \ \ | |/ /
| * | CMake 3.25.0-rc3v3.25.0-rc3Brad King2022-11-011-1/+1
| | |
* | | Merge branch 'release-3.25'Brad King2022-11-010-0/+0
|\ \ \ | |/ /
| * | Merge branch 'release-3.24' into release-3.25Brad King2022-11-011-0/+11
| |\ \
* | \ \ Merge branch 'release-3.24'Brad King2022-11-011-0/+11
|\ \ \ \ | | |/ / | |/| |
| * | | CMake 3.24.3v3.24.3Brad King2022-11-012-1/+12
| | | |
* | | | Merge branch 'release-3.25'Brad King2022-11-010-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'release-3.24' into release-3.25Brad King2022-11-011-2/+2
| |\ \ \ | | |/ /
* | | | Merge branch 'release-3.24'Brad King2022-11-010-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'release-3.23' into release-3.24Brad King2022-11-011-2/+2
| |\ \ \
* | \ \ \ Merge branch 'release-3.23'Brad King2022-11-011-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | CMake 3.23.5v3.23.5Brad King2022-11-012-3/+3
| | | | |
* | | | | Merge topic 'compile-commands-output-field'Brad King2022-11-018-10/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 887a8874c3 EXPORT_COMPILE_COMMANDS: add `output` field Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7844
| * | | | | EXPORT_COMPILE_COMMANDS: add `output` fieldBen Boeckel2022-10-288-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also write for all configurations from multi-config generators. This field was added in the Clang 5 documentation and not present in the Clang 4 documentation (sometime between Dec 2016 and Mar 2017 according to `web.archive.org`).
* | | | | | Merge topic 'test-objc'Brad King2022-11-014-68/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb2370842f Tests: Simplify RunCMake.try_compile compiler inspection 1abcb094a7 Tests: Fix logic to enable RunCMake.try_compile OBJC/OBJCXX cases b641a80d55 Tests: Factor out a CMake_TEST_OBJC variable for OBJC/OBJCXX test conditions Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7855
| * | | | | | Tests: Simplify RunCMake.try_compile compiler inspectionBrad King2022-10-313-48/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect the compiler id, version, and default standard level in the test's inspection step rather than passing it all in from the host CMake build's results. This avoids repeating details not known to older versions of CMake, and shortens the code.
| * | | | | | Tests: Fix logic to enable RunCMake.try_compile OBJC/OBJCXX casesBrad King2022-10-313-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake itself does not enable the OBJC/OBJCXX languages, so the `CMAKE_OBJ{C,CXX}_STANDARD_DEFAULT` variables are never defined. Detect them inside the test instead.
| * | | | | | Tests: Factor out a CMake_TEST_OBJC variable for OBJC/OBJCXX test conditionsBrad King2022-10-312-9/+17
| | | | | | |
* | | | | | | Merge topic 'test-eol'Brad King2022-11-012-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4180159758 Tests: Provide RunCMake.CommandLine compare_files data more robustly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7852
| * | | | | | | Tests: Provide RunCMake.CommandLine compare_files data more robustlyBrad King2022-10-312-3/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `lf` and `crlf` files need to have exact LF and CRLF newlines, respectively. Previously we used the Git `eol` attribute for this, but occasionally the Git work tree ends up without the conversion. It is unclear why that happens, so try to avoid the problem by treating their content as binary instead.
* | | | | | | Merge topic 'lcc-cleanup'Brad King2022-11-011-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2943d9ec8 Tests: Teach CheckSourceTree test to clean up more specific known files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7850
| * | | | | | | Tests: Teach CheckSourceTree test to clean up more specific known filesBrad King2022-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the list of files added by commit 2de1458c3c (Tests: Teach CheckSourceTree test to clean up some specific known files, 2022-10-13).
* | | | | | | | Merge topic 'update-nghttp2'Brad King2022-11-0128-695/+3252
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e44b551e8d nghttp2: Update build within CMake to account for 1.50.0 8b73605408 Merge branch 'upstream-nghttp2' into update-nghttp2 7ce2a682a3 nghttp2 2022-09-21 (87fef4ab) 66c9536775 nghttp2: Update script to get nghttp2 1.50.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7856
generated by cgit v0.12 at 2025-09-09 21:51:09 (GMT)