summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* try_compile: Report build dir with --debug-trycompileMatthew Woehlke2022-10-066-1/+49
| | | | | | | | When `--debug-trycompile` is enabled, issue a log (with trace) for every `try_compile` noting what directory is being used for the compilation. This will make it easier to find the corresponding artifacts. Closes: #24022
* Tests: Remove stray debugging flag from RunCMake.CheckCompilerFlag caseBrad King2022-10-051-1/+1
|
* Merge branch 'release-3.24'Brad King2022-10-040-0/+0
|\
| * Merge branch 'release-3.23' into release-3.24Brad King2022-10-041-3/+3
| |\
* | \ Merge branch 'release-3.23'Brad King2022-10-041-3/+3
|\ \ \ | | |/ | |/|
| * | CMake 3.23.4v3.23.4Brad King2022-10-042-4/+4
| | |
* | | Merge topic 'ci-intel-compiler'Brad King2022-10-042-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f391c1c269 gitlab-ci: add jobs testing Intel 2022.2.0 compilers on Linux 29e45a94b0 Tests: Teach RunCMake to ignore Intel Classic compiler deprecation warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7742
| * | | gitlab-ci: add jobs testing Intel 2022.2.0 compilers on LinuxBrad King2022-10-031-0/+14
| | | | | | | | | | | | | | | | | | | | Note that the classic compiler version is 2021.7.0, but we still have it in the 2022.2.0 base image.
| * | | Tests: Teach RunCMake to ignore Intel Classic compiler deprecation warningsBrad King2022-10-031-0/+1
| | | |
* | | | Merge topic 'FindGDAL-debug-msvc'Brad King2022-10-041-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fdc95c6d19 FindGDAL: Add library name for MSVC Debug GDAL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7737
| * | | | 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-ios-objects'Brad King2022-10-042-0/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25630863ea Tests: Add case covering XCODE_EMIT_EFFECTIVE_PLATFORM_NAME=OFF for iOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7740
| * | | | | Tests: Add case covering XCODE_EMIT_EFFECTIVE_PLATFORM_NAME=OFF for iOSBrad King2022-10-032-0/+30
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This use case was fixed by commit a7fb4bc475 (Xcode: Set build product locations using CONFIGURATION_BUILD_DIR, 2022-09-28). Add a test to verify the fix. Fixes: #23970
* | | | | Merge topic 'improve-try_compile-debug-documentation'Brad King2022-10-042-12/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3801785cc3 Help: Improve try_compile debug documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: alcroito <alexandru.croitor@qt.io> Merge-request: !7735
| * | | | | Help: Improve try_compile debug documentationMatthew Woehlke2022-10-032-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the --debug-trycompile documentation to account for recent changes to try_compile. Mention where in the build tree to find artifacts when using said option.
* | | | | | Merge topic 'fix-try_compile-doc-typo'Brad King2022-10-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef05a56387 Help: Fix typo in try_compile documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7736
| * | | | | | Help: Fix typo in try_compile documentationMatthew Woehlke2022-09-301-1/+1
| |/ / / / /
* | | | | | Merge topic 'try_compile-rename-source_from_arg'Brad King2022-10-0411-35/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f28653ba9 try_compile: Rename SOURCE_FROM_ARG -> SOURCE_FROM_CONTENT Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7733
| * | | | | | try_compile: Rename SOURCE_FROM_ARG -> SOURCE_FROM_CONTENTMatthew Woehlke2022-09-3011-35/+37
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the SOURCE_FROM_ARG keyword to try_compile to SOURCE_FROM_CONTENT (which we can do because it was recently added and hasn't been in a release yet). The new name should be clearer as to what it does, and also more consistent with the CONTENT arguments to some other commands. Also, fix a typo in an error message.
* | | | | | CMake Nightly Date StampKitware Robot2022-10-041-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'ExternalProject-git-dir'Brad King2022-10-031-19/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e07039cd26 ExternalProject: Explicitly run Git commands on intended directory Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7731
| * | | | | ExternalProject: Explicitly run Git commands on intended directoryPatrick Stewart2022-09-301-19/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `--git-dir=.git` to cause git commands to fail instantly if the `.git` folder has gone missing. Fixes: #24007
* | | | | Merge branch 'release-3.24'Brad King2022-10-030-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge topic 'ci-xcode-14.0' into release-3.24Brad King2022-10-037-37/+66
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cdf4c9be4 gitlab-ci: update macOS jobs to use Xcode 14.0 5d2c2b2558 Tests: Update RunCMake.XcodeProject iOS cases for Xcode 14.0 12c6fec6b4 Xcode: Drop CMAKE_INTDIR= definition in Swift targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7732
* | \ \ \ \ Merge topic 'ci-xcode-14.0'Brad King2022-10-037-37/+66
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cdf4c9be4 gitlab-ci: update macOS jobs to use Xcode 14.0 5d2c2b2558 Tests: Update RunCMake.XcodeProject iOS cases for Xcode 14.0 12c6fec6b4 Xcode: Drop CMAKE_INTDIR= definition in Swift targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7732
| * | | | | gitlab-ci: update macOS jobs to use Xcode 14.0Brad King2022-09-301-6/+6
| | | | | |
| * | | | | Tests: Update RunCMake.XcodeProject iOS cases for Xcode 14.0Brad King2022-09-305-29/+53
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #24011
| * | | | | Xcode: Drop CMAKE_INTDIR= definition in Swift targetsBrad King2022-09-301-2/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | Xcode 14.0 warns that Swift doesn't support definition values. Therefore `CMAKE_INTDIR` is not useful to Swift sources. Drop it.
* | | | | CMake Nightly Date StampKitware Robot2022-10-031-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-10-021-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-10-011-1/+1
| |_|/ / |/| | |
* | | | 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