summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindGDAL: Add library name for MSVC Debug GDALGregoire Krähenbühl2022-10-031-1/+1
| | | | | | | Search for `gdald.lib`, which is how the library is now named when built with CMake under MSVC Debug. Fixes: #24015
* Merge topic 'xcode-build-layout'Brad King2022-09-307-48/+34
|\ | | | | | | | | | | | | | | | | | | d0a6ebf57b Xcode: Fix "clean" operation under the "new build system" dc5fc898f6 Xcode: Set object file locations using TARGET_TEMP_DIR a7fb4bc475 Xcode: Set build product locations using CONFIGURATION_BUILD_DIR 6883b82124 cmGlobalXCodeGenerator: Remove unused local variable settings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7730
| * Xcode: Fix "clean" operation under the "new build system"Brad King2022-09-295-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously we set `SYMROOT` to tell Xcode where to place the build products. However, the "clean" operation in the Xcode "new build system" expects that only Xcode creates the `SYMROOT` directory or contents inside it. Since we create that directory, "clean" fails. We now explicitly set `CONFIGURATION_BUILD_DIR` and `TARGET_TEMP_DIR` instead of letting Xcode compute their values from `SYMROOT`, so we no longer need to set the latter. Drop the now-unnecessary `SYMROOT`. Fixes: #22550
| * Xcode: Set object file locations using TARGET_TEMP_DIRBrad King2022-09-293-34/+12
| | | | | | | | | | | | This avoids relying on `SYMROOT` to locate the object files. Issue: #22550
| * Xcode: Set build product locations using CONFIGURATION_BUILD_DIRBrad King2022-09-291-11/+13
| | | | | | | | | | | | | | | | | | | | Since commit 59a2265576 (Xcode: Use EFFECTIVE_PLATFORM_NAME reference in ComputeOutputDir, 2011-08-12, v2.8.6~43^2~1) we can now set the build products path using `CONFIGURATION_BUILD_DIR` unconditionally because we compute the correct value even when using `EFFECTIVE_PLATFORM_NAME`. This avoids relying on `SYMROOT` to locate the build products. Issue: #22550
| * cmGlobalXCodeGenerator: Remove unused local variable settingsBrad King2022-09-291-4/+0
| |
* | Merge topic 'compiler-tests'Brad King2022-09-3010-0/+46
|\ \ | | | | | | | | | | | | | | | | | | | | | 586c2ab4f1 Tests: Test more CMakeTest*Compiler.cmake fallbacks Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7727
| * | Tests: Test more CMakeTest*Compiler.cmake fallbacksBrad King2022-09-2910-0/+46
| | | | | | | | | | | | | | | Extend the test added by commit f891a75d5c (Tests: Test CMakeTest*Compiler.cmake fallbacks, 2022-09-27) to cover more languages.
* | | Merge topic 'revert-ci-debian10-clang-tidy-headers'Brad King2022-09-303-25/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c8c965435 ci: Revert "add clang-tidy to Debian x86_64 base image" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !7729
| * | | ci: Revert "add clang-tidy to Debian x86_64 base image"Brad King2022-09-293-25/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 0ac9ec47f6 (ci: add clang-tidy to Debian x86_64 base image, 2022-09-20). Our clang-tidy job runs under Fedora, and we need the plugin to compile there anyway, so lints like IWYU will best be done in the Fedora image. Issue: #23912
* | | CMake Nightly Date StampKitware Robot2022-09-301-1/+1
|/ /
* | Merge topic 'try_compile-no-cache'Brad King2022-09-297-7/+104
|\ \ | | | | | | | | | | | | | | | | | | | | | 09b3051524 try_compile: Add NO_CACHE option (also try_run) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7723
| * | try_compile: Add NO_CACHE option (also try_run)Matthew Woehlke2022-09-287-7/+104
| | | | | | | | | | | | | | | | | | | | | Add NO_CACHE option to try_compile and try_run, which places the results in regular, rather than cache, variables. Issue: #22799
* | | Merge topic 'traversaro-master-patch-54928'Brad King2022-09-291-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e0a62b84b5 FindGLUT: On Windows and with multiple config generator do not use pkg-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7721
| * | | FindGLUT: On Windows and with multiple config generator do not use pkg-configSilvio Traversaro2022-09-281-1/+4
| |/ /
* | | Merge topic 'tutorial_step4_update'Brad King2022-09-2910-32/+288
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37fceb6fd3 Tutorial: Update step 4 style Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7646
| * | | Tutorial: Update step 4 styleMarkus Ferrell2022-09-2810-32/+288
| | | |
* | | | Merge topic 'fix-compiler-test-message'Brad King2022-09-291-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da45136ce3 CMakeTestCXXCompiler.cmake: Improve logging consistency Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7724
| * | | | CMakeTestCXXCompiler.cmake: Improve logging consistencyMatthew Woehlke2022-09-281-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Use "C++ compiler" rather than "CXX compiler" in certain logging messages. This improves both internal consistency (as "C++ compiler" was already used elsewhere) and consistency with e.g. the equivalent logging for the "Objective-C[++] compiler".
* | | | Merge topic 'compiler-tests'Brad King2022-09-2911-0/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f891a75d5c Tests: Test CMakeTest*Compiler.cmake fallbacks Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7722
| * | | | Tests: Test CMakeTest*Compiler.cmake fallbacksMatthew Woehlke2022-09-2811-0/+36
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests that explicitly test the fallback tests of the modules which test for a functional [Obj]C[xx] compiler, bypassing the ABI tests. Due to the ABI test short-circuiting added by commit 1d21dd0f7c (enable_language: Assume compiler works if ABI detection compiles, 2020-05-25, v3.18.0-rc1~93^2), this logic is likely not getting tested otherwise.
* | | | CMake Nightly Date StampKitware Robot2022-09-291-1/+1
| |/ / |/| |
* | | Merge topic 'use-try_compile-source-from'Brad King2022-09-2828-157/+150
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41f7b1169a Modules: Use new SOURCES_FROM_* try_compile (2/2) db76876db5 Modules: Use new SOURCES_FROM_* try_compile (1/2) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7717
| * | | Modules: Use new SOURCES_FROM_* try_compile (2/2)Matthew Woehlke2022-09-279-79/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify some additional modules that ship with CMake to use the new SOURCES_FROM_* arguments to try_compile / try_run as added by commits cb14ae2b87 (try_compile: Add SOURCE_FROM_{ARG,VAR}, 2022-09-21) and 611d801790 (try_compile: Add SOURCE_FROM_FILE, 2022-09-22). This covers modules that need to read and alter a template source file, which were not addressed in the previous commit. Note that FindOpenACC.cmake does not actually need configure_file functionality; it appears to have inherited the (gratuitous) use thereof from FindOpenMP.cmake, with which its code bears significant similarity.
| * | | Modules: Use new SOURCES_FROM_* try_compile (1/2)Matthew Woehlke2022-09-2719-78/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify some modules that ship with CMake to use the new SOURCES_FROM_* arguments to try_compile / try_run as added by commits cb14ae2b87 (try_compile: Add SOURCE_FROM_{ARG,VAR}, 2022-09-21) and 611d801790 (try_compile: Add SOURCE_FROM_FILE, 2022-09-22). This covers users which previously either used an existing file (but sometimes needed to rename it), or which wrote out their source in entirety. It does NOT cover users that actually need configure_file functionality, as those will be more involved to update and will thus be tackled in part 2.
* | | | Merge topic 'vs11-deprecate'Brad King2022-09-2811-4/+55
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c1337cb79 Deprecate Visual Studio 11 2012 generator 5faf145a5b Tests: Drop unused files from RunCMake.CommandLine Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7720
| * | | | Deprecate Visual Studio 11 2012 generatorBrad King2022-09-2711-4/+55
| | | | | | | | | | | | | | | | | | | | | | | | | Update documentation to mark the generator deprecated. Add a warning at the end of generation plus an option to turn off the warning.
| * | | | Tests: Drop unused files from RunCMake.CommandLineBrad King2022-09-272-0/+0
| | |/ / | |/| | | | | | | | | | | | | | Remove files missed by commit 8d6f015d59 (Drop Visual Studio 10 2010 generator, 2022-09-26).
* | | | Merge topic 'cmake-presets-workflow'Brad King2022-09-2864-16/+1297
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 374d82bbcd cmake: Add --workflow mode e316812884 CMakePresets.json: Add workflow presets to schema Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7711
| * | | | cmake: Add --workflow modeKyle Edwards2022-09-2758-11/+981
| | | | | | | | | | | | | | | | | | | | Fixes: #23118
| * | | | CMakePresets.json: Add workflow presets to schemaKyle Edwards2022-09-266-5/+316
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-09-281-1/+1
| |/ / / |/| | |
* | | | Merge topic 'remove-vs10-generator'Brad King2022-09-2728-361/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d6f015d59 Drop Visual Studio 10 2010 generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7718
| * | | | Drop Visual Studio 10 2010 generatorBrad King2022-09-2628-361/+38
| |/ / / | | | | | | | | | | | | This generator has been deprecated since CMake 3.22. Remove it.
* | | | Merge topic 'drop-try_run-macro'Brad King2022-09-271-11/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b2e765025 Drop try_run macro from CMake's own build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7719
| * | | | Drop try_run macro from CMake's own buildBrad King2022-09-261-11/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 9199f7c627 (Disable arch-specific try_run in CMake itself, 2009-12-14, v2.8.2~567) we've abused an undocumented debugging feature to override the builtin `try_run` command in CMake's own build with a wrapper macro. However, we've also long discouraged use of this feature by other projects. The purpose of the original change is outdated and of limited use anyway, so just drop it.
* | | | Merge topic 'add_subdirectory_system'Brad King2022-09-2742-18/+199
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2eb30a7036 add_subdirectory: Add SYSTEM option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7399
| * | | | add_subdirectory: Add SYSTEM optionDa Quexian2022-09-2642-18/+199
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22401 Signed-off-by: Da Quexian <daquexian566@gmail.com>
* | | | | Merge topic 'cpack-nsis-arguments-command-line'Brad King2022-09-273-2/+70
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1613ac880 CPack/NSIS: Add options to set makensis arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7715
| * | | | | CPack/NSIS: Add options to set makensis argumentsJohnny Jazeix2022-09-263-2/+70
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23446
* | | | | | Merge topic 'vs-dotnet-sdk-output-paths'Brad King2022-09-271-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7671d71299 VS: Fix target output paths in SDK-style projects Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7713
| * | | | | | VS: Fix target output paths in SDK-style projectselksson2022-09-231-0/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the `AppendTargetFrameworkToOutputPath` property to `false` so that MSBuild does not append anything extra to our standard target output paths. This fixes the `INSTALL` target, among other things. Fixes: #23989
* | | | | | Merge branch 'release-3.24'Brad King2022-09-270-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge topic 'ctest_ninja_full_output' into release-3.24Brad King2022-09-277-11/+68
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65260d6c1e ctest: only report make-level errors when no others are found Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7710
* | \ \ \ \ \ \ Merge topic 'ctest_ninja_full_output'Brad King2022-09-277-11/+68
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65260d6c1e ctest: only report make-level errors when no others are found Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7710
| * | | | | | | ctest: only report make-level errors when no others are foundZack Galbreath2022-09-267-11/+68
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit ab9ad2a6a0 (ctest: report make-level errors to CDash when using launchers, 2020-09-24, v3.19.0-rc1~84^2~1) we taught CTest to capture and report errors from the build command when using launchers. This had the unintended side effect of reporting a separate build error containing the full build output when the build command returns non-zero. To fix this problem, we now only report build command errors from CTest launchers when no other more specific build errors are found. Fixes: #23991
* | | | | | | Merge topic 'update-libuv'Brad King2022-09-2756-1410/+2530
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23de1675fd libuv: Update CMake-internal buildsystem for 1.44.2 ff82df301c Merge branch 'upstream-libuv' into update-libuv a23da15596 libuv 2022-07-12 (0c1fa696) cfe8fd6421 libuv: Update script to get libuv 1.44.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7709
| * | | | | | | libuv: Update CMake-internal buildsystem for 1.44.2Brad King2022-09-274-0/+13
| | | | | | | |
| * | | | | | | Merge branch 'upstream-libuv' into update-libuvBrad King2022-09-2752-1409/+2516
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-libuv: libuv 2022-07-12 (0c1fa696)
| | * | | | | | | libuv 2022-07-12 (0c1fa696)libuv upstream2022-09-2752-1410/+2517
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit 0c1fa696aa502eb749c2c4735005f41ba00a27b8 (v1.44.2).