summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ccmake: Restore compilation with AIX curses.hBrad King2022-12-071-0/+3
| | | | | | | | On AIX, including `<curses.h>` includes `<term.h>` which defines a bunch of non-prefixed, lower-case macro names. Undefine one that conflicts with our source code. Fixes: #24229
* Merge topic 'doc-SYSTEM' into release-3.25Brad King2022-12-073-7/+7
|\ | | | | | | | | | | | | b15b9cf286 Help: Clarify SYSTEM property default for imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7990
| * Help: Clarify SYSTEM property default for imported targetsBrad King2022-12-063-7/+7
| | | | | | | | | | | | The `SYSTEM` directory property does not affect imported targets. Fixes: #24219
* | Merge topic 'ci-os-arch' into release-3.25Brad King2022-12-065-47/+30
|\ \ | |/ |/| | | | | | | | | | | 2bf1ce6cc3 gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release branch 429574a94e gitlab-ci: replace '$os' tags with '$os-x86_64' on 3.25 release branch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7995
| * gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release branchBrad King2022-12-062-33/+16
| | | | | | | | | | | | | | | | All our CI hosts now have Linux kernel version 3.17 or higher, so we no longer need a dedicated tag. This backports commit c212c7dc8b (gitlab-ci: drop unnecessary linux kernel version tag, 2022-11-30) to the 3.25 release branch.
| * gitlab-ci: replace '$os' tags with '$os-x86_64' on 3.25 release branchBrad King2022-12-064-15/+15
|/ | | | | | | | | | | The latter tags are now available on our CI runners to more explicitly distinguish `linux-x86_64` from `linux-aarch64` and to distinguish `{macos,windows}-x86_64` from `{macos,windows}-arm64`. This backports commit 33fe37a660 (gitlab-ci: replace '{macos,windows}' tags with '{macos,windows}-x86_64', 2022-11-30) and commit 94d82d91d5 (gitlab-ci: replace 'linux' tags with 'linux-x86_64', 2022-11-30) to the 3.25 release branch.
* Merge topic 'CheckSymbolExists-restore-newline' into release-3.25Brad King2022-12-051-1/+1
|\ | | | | | | | | | | | | | | 9273b8f421 CheckSymbolExists: Restore newline at end of test source Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Petr Nechaev <petr.nechaev@cogentembedded.com> Merge-request: !7979
| * CheckSymbolExists: Restore newline at end of test sourceAndrey Vostrikov2022-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | Refactoring in commit db76876db5 (Modules: Use new SOURCES_FROM_* try_compile (1/2), 2022-09-26, v3.25.0-rc1~74^2~1) accidentally dropped the final newline of the test source, which was previously provided by the input to `configure_file`. The C standard requires a newline at the end of file, so add one explicitly. Signed-off-by: Andrey Vostrikov <andrey.vostrikov@cogentembedded.com>
* | Merge topic 'FetchContent-SYSTEM' into release-3.25Craig Scott2022-12-051-0/+3
|\ \ | |/ |/| | | | | | | | | 4b85141f83 FetchContent: Don't pass SYSTEM through to sub-build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7977
| * FetchContent: Don't pass SYSTEM through to sub-buildCraig Scott2022-12-021-0/+3
|/ | | | | | | | | If we don't filter out SYSTEM from the arguments we pass through to ExternalProject_Add(), it gets appended as a list item to whatever arguments precede it because ExternalProject_Add() doesn't recognize it as a keyword. Fixes: #24201
* Merge branch 'release-3.24' into release-3.25Brad King2022-11-300-0/+0
|\
| * Merge branch 'rel-win-sign-digest' into release-3.24Brad King2022-11-301-1/+1
| |\ | | | | | | | | | Merge-request: !7970
* | \ Merge topic 'rel-win-sign-digest' into release-3.25Brad King2022-11-301-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 870f30aacc Utilities/Release: Use explicit digest for Win7-compatible signature Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7970
| * | Utilities/Release: Use explicit digest for Win7-compatible signatureBrad King2022-11-301-1/+1
| |/ | | | | | | Otherwise `signtool` warns.
* | CMake 3.25.1v3.25.1Brad King2022-11-301-1/+1
| |
* | Merge topic 'fortran-regression' into release-3.25Brad King2022-11-305-146/+183
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | a67da2ef66 Tests/FortranModules: add case for modules after "end interface X" 88fb1980c3 Fortran: Restore support for parsing "end interface X" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7966
| * | Tests/FortranModules: add case for modules after "end interface X"Ben Boeckel2022-11-303-0/+22
| | | | | | | | | | | | | | | | | | | | | When there is an `end interface X` in a file, subsequent modules should not be considered part of interface X. Issue: #24203
| * | Fortran: Restore support for parsing "end interface X"Brad King2022-11-302-146/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 219a9b1e14 (Fortran: Fix suprious dependencies with submodules, 2022-07-30, v3.25.0-rc1~327^2) we accidentally fail to recognize `end interface X`, causing all subsequent modules to be seen as an interface. Fixes: #24203
* | | Merge topic 'source-from-var' into release-3.25Brad King2022-11-292-4/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f6b99c5087 Check*: Restore support for arbitrary result variable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7960
| * | | Check*: Restore support for arbitrary result variable namesZhong Ruoyu2022-11-282-4/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit db76876db5 (Modules: Use new SOURCES_FROM_* try_compile (1/2), 2022-09-26, v3.25.0-rc1~74^2~1) and commit 41f7b1169a (Modules: Use new SOURCES_FROM_* try_compile (2/2), 2022-09-26, v3.25.0-rc1~74^2) the switch to `SOURCE_FROM_*` required a stronger precondition (the second argument to check_include_files must not have path components) than before (any variable name could be used). Fix that by transforming the variable name to a C identifier before feeding it to try_compile as a filename. The filename is unspecified by the documentation, and the file itself is only temporary, so that should work fine. I have gone through all the occurrences of `SOURCE_FROM_*`, and identified these two that require changes. The rest should work fine as the filenames do not depend on input variable names. Fixes: #24204
* | | Merge topic 'FindRuby-doc-fix' into release-3.25Brad King2022-11-291-3/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0d7f40a5c4 FindRuby: Remove documentation for non-existent Ruby_ROOT_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7954
| * | | FindRuby: Remove documentation for non-existent Ruby_ROOT_DIRHannes Braun2022-11-281-3/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | Documentation was added by commit 905d5667e8 (FindRuby: Add support for RVM installations, 2020-03-23, v3.18.0-rc1~497^2), but this feature was never implemented. Closes: #21528
* | | Merge topic 'android-no-LINUX' into release-3.25Brad King2022-11-291-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19509249a5 Android: Revert setting LINUX variable on Android target systems Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Nevala <robert.nevala@king.com> Acked-by: n00b42 <github.com@mail.msdigital.de> Merge-request: !7963
| * | | Android: Revert setting LINUX variable on Android target systemsBrad King2022-11-281-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 62cd3904bf (variable: Set LINUX variable on Linux target systems, 2022-08-10, v3.25.0-rc1~320^2), the `Platform/Android` module inherits the `LINUX` variable setting from `Platform/Linux`. While Android may use a Linux kernel, `CMAKE_SYSTEM_NAME` is not `Linux`, and the platform does not follow conventions of most Linux distributions. Fixes: #24196
* | | Merge topic 'msvc-cxx-no-optin-experimental-flag' into release-3.25Brad King2022-11-293-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12e4bc73cb MSVC: don't opt into dyndep support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7965
| * | | MSVC: don't opt into dyndep supportBen Boeckel2022-11-283-2/+4
| |/ / | | | | | | | | | | | | | | | | | | Instead, just set the variables for how scanning works since that is part of the compiler mechanisms. Fixes: #24198
* | | Merge topic 'revert-find_library-msvc-libfoo.a' into release-3.25Brad King2022-11-292-7/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 955d6245c1 MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7962
| * | | MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention"Brad King2022-11-282-7/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit be848a71b0 (MSVC: Teach find_library to consider the 'libfoo.a' naming convention, 2022-09-19, v3.25.0-rc1~111^2). When targeting the MSVC ABI, this causes GNU-ABI libraries to be found in cases they were not previously, and broke existing builds. Revert the change pending further discussion on how to handle the motivating use case. Issue: #23975 Fixes: #24168
* | | Merge branch 'release-3.24' into release-3.25Brad King2022-11-290-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'mingw-windres' into release-3.24Brad King2022-11-292-7/+11
| |\ \ | | | | | | | | | | | | Merge-request: !7964
* | \ \ Merge topic 'mingw-windres' into release-3.25Brad King2022-11-292-7/+11
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | b47092fddb MinGW: Fix regression when windres is not found Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7964
| * | MinGW: Fix regression when windres is not foundBrad King2022-11-292-7/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | The fix in commit e9755bc7c1 (MinGW: Restore using windres when toolchain-prefixed name is not available, 2022-08-15, v3.24.1~4^2) incorrectly listed two entries in `CMAKE_RC_COMPILER_INIT`, which is only meant to have one value. Revise the logic to support multiple platform-specific names for the Windows Resource Compiler while still only using one name as the fallback when it is not found. Fixes: #24190 Issue: #23841
* | Merge topic 'try_compile-copy-config' into release-3.25Brad King2022-11-233-4/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 80fc564dd7 try_compile: Restore COPY_FILE with CMAKE_TRY_COMPILE_CONFIGURATION Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Merge-request: !7948
| * | try_compile: Restore COPY_FILE with CMAKE_TRY_COMPILE_CONFIGURATIONBrad King2022-11-223-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0c141b0393 (try_compile: Record output location instead of reverse computing it, 2022-08-31, v3.25.0-rc1~154^2) we always look for the "Debug" configuration's output binary from the test project. Restore looking for the `CMAKE_TRY_COMPILE_CONFIGURATION`. Fixes: #24180
* | | Merge topic 'XCode-XCODE_LINK_BUILD_PHASE_MODE-and-LINK_LIBRARY-genex' into ↵Brad King2022-11-235-29/+127
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.25 61075d2d7b XCode: ensure LINK_LIBRARY genex is usable with XCODE_LINK_BUILD_PHASE_MODE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7947
| * | | XCode: ensure LINK_LIBRARY genex is usable with XCODE_LINK_BUILD_PHASE_MODEMarc Chevrier2022-11-225-29/+127
|/ / / | | | | | | | | | Fixes: #24176
* | | Merge topic 'cxxmodules-doc-msvc-modmapfmt' into release-3.25Brad King2022-11-221-2/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 19fc1ba630 Help/dev/experimental: document the `msvc` module map format Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7944
| * | Help/dev/experimental: document the `msvc` module map formatBen Boeckel2022-11-211-2/+7
| | |
* | | Merge topic 'FindCUDA-nppicom' into release-3.25Brad King2022-11-221-1/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 3ddfdc38eb FindCUDA: Do not use CUDA_nppicom_LIBRARY in CUDA 11.0+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7938
| * | FindCUDA: Do not use CUDA_nppicom_LIBRARY in CUDA 11.0+Oleksii Udod2022-11-181-1/+3
|/ / | | | | | | | | | | | | | | Extend the change from commit 1d9f2f9714 (FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11, 2020-06-22, v3.18.0-rc3~14^2) to also not use the `CUDA_nppicom_LIBRARY` variable. Issue: #20845
* | Merge topic 'FindCUDAToolkit_handle_nvptxcompiler_static_not_existing' into ↵Brad King2022-11-181-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | release-3.25 c7ece269da FindCUDAToolkit: Handle toolkits that don't provide nvptxcompiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7932
| * | FindCUDAToolkit: Handle toolkits that don't provide nvptxcompilerRobert Maynard2022-11-171-1/+3
| | | | | | | | | | | | | | | | | | Some versions of the CUDA toolkit don't provide any static libraries, and therefore we need to handle that `nvptxcompiler_static` might not be found
* | | Merge branch 'release-3.24' into release-3.25Brad King2022-11-170-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'test-FindBoost-python-versions' into release-3.24Brad King2022-11-171-2/+2
| |\ \ | | | | | | | | | | | | Merge-request: !7929
* | \ \ Merge topic 'test-FindBoost-python-versions' into release-3.25Brad King2022-11-171-2/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | 6b1f933cb8 Tests: Update FindBoost.TestPython for Python 3.11 and 3.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7929
| * | Tests: Update FindBoost.TestPython for Python 3.11 and 3.12Brad King2022-11-161-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | Follow up the python 3.11 and 3.12 support from: * commit 43844c5d82 (FindPython: Add support for Python 3.11, 2021-12-07, v3.22.2~20^2) * commit ca2877c039 (FindPython: add support for Python 3.12, 2022-05-11, v3.23.2~15^2) with an update for the FindBoost test.
* | CMake 3.25.0v3.25.0Brad King2022-11-161-1/+1
| |
* | Merge topic 'qtifw-4.5' into release-3.25Brad King2022-11-161-0/+2
|\ \ | | | | | | | | | | | | | | | | | | 351239b776 CPack/IFW: Add support for QtIFW 4.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7920
| * | CPack/IFW: Add support for QtIFW 4.5Erlend E. Aasland2022-11-151-0/+2
| | | | | | | | | | | | Fixes: #24164
* | | Merge topic 'cmp0141-pch-reuse' into release-3.25Brad King2022-11-163-2/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 94164ea55e CMP0141: Fix PCH REUSE_FROM when MSVC_DEBUG_INFORMATION_FORMAT is empty Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7914
generated by cgit v0.12 at 2024-12-29 06:31:01 (GMT)