summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'file-grd-arch' into release-3.21Brad King2021-07-135-6/+66
|\ | | | | | | | | | | | | b2c03347b0 file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6339
| * file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependenciesKyle Edwards2021-07-125-6/+66
| | | | | | | | Fixes: #22106
* | Merge topic 'doc-preset-example-v3' into release-3.21Brad King2021-07-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | 2114d717a0 Help: Fix preset example cmakeMinimumRequired Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !6333
| * | Help: Fix preset example cmakeMinimumRequiredSérgio Martins2021-07-121-1/+1
| |/ | | | | | | | | | | | | | | Since commit 8bc5c8961e (CMakePresets.json: Add the ability to conditionally disable presets, 2021-03-10, v3.21.0-rc1~464^2) the example requires presets version 3 support, which is not available until CMake 3.21. CMake 3.20.0 can't open v3 presets. Make cmakeMinimumRequired compatible with the example's version.
* | Merge topic 'cpack-deb-post-ops' into release-3.21Brad King2021-07-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 805fa791d1 CPack/DEB: Avoid overriding user-provided `postinst` and `postrm` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6335
| * | CPack/DEB: Avoid overriding user-provided `postinst` and `postrm`Alex Turbov2021-07-121-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | When a user provides `CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA` or `CPACK_DEBIAN_<comp>_PACKAGE_CONTROL_EXTRA` variables in `CMakeLists.txt` and the package contains dynamic libraries, the `CPackDeb.cmake` sets `CPACK_ADD_LDCONFIG_CALL` to `1`. Later it analyzes if defaulted `postinst`/`postrm` should be generated trying to check if the user provides any in `CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA` variable. However, the `foreach` loop uses the invalid variable `PACKAGE_CONTROL_EXTRA` instead, so these files gonna be overridden. Fix the variable name. Fixes: #22410
* | Merge topic 'FindBLAS-LAPACK-All' into release-3.21Brad King2021-07-137-14/+40
|\ \ | |/ |/| | | | | | | | | | | 31ac4b9165 ci: Verify that Intel MKL is found when it is the only BLAS/LAPACK 57dcde19da Find{BLAS,LAPACK}: Avoid clobbering results when no vendor is requested Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6336
| * ci: Verify that Intel MKL is found when it is the only BLAS/LAPACKBrad King2021-07-125-10/+36
| | | | | | | | Issue: #22403
| * Find{BLAS,LAPACK}: Avoid clobbering results when no vendor is requestedBrad King2021-07-122-4/+4
|/ | | | | | | | | | | | Logic added by commit 4c74c86f40 (FindBLAS/LAPACK: Add support for the Fujitsu SSL2 library, 2021-01-27, v3.21.0-rc1~402^2~1) accidentally expressed a boolean condition without proper grouping. The pattern was then copied by commit 2c9e623e31 (Find{BLAS,LAPACK}: Add support for the NVHPC LAPACK library, 2021-05-05, v3.21.0-rc1~192^2). The resulting logic incorrectly tries Fujitsu and NVHPC vendors even after results are found from another vendor, and then erases those. Fix the grouping. Fixes: #22403
* Merge branch 'release-3.20' into release-3.21Brad King2021-07-120-0/+0
|\
| * Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20Brad King2021-07-092-3/+15
| |\ | | | | | | | | | Merge-request: !6328
| * \ Merge branch 'FindJPEG-revert-turbo' into release-3.20Brad King2021-07-091-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !6326
* | \ \ Merge topic 'intel-oneapi-std-windows' into release-3.21Brad King2021-07-121-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a82af0e2ce Merge branch 'backport-3.20-intel-oneapi-std-windows' 1c227583a4 Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC mode 1c14691a86 CMakeCCompilerId: Fix C standard detection in Clang and IntelLLVM MSVC mode 6eea123e3a Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6328
| * \ \ \ Merge branch 'backport-3.20-intel-oneapi-std-windows'Brad King2021-07-090-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC modeBrad King2021-07-091-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 5115dd1e2c (IntelLLVM: Fix C/C++ standard level flags on Windows, 2021-07-07, v3.21.0-rc3~7^2^2) we activate C/C++ standard level logic for IntelLLVM when targeting the MSVC ABI. Update the `RunCMake.try_compile` test to be aware of this even when CMake is itself configured by an older CMake that does not know this.
| | * | | CMakeCCompilerId: Fix C standard detection in Clang and IntelLLVM MSVC modeRaul Tambre2021-07-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang does not define `__STDC__` if in MSVC compatibility mode, but does define `__STDC_VERSION__`. Avoid the fallback for this combination. This backports commit 7596d8b951 (CMakeCCompilerId: Fix C standard detection in Clang MSVC mode, 2021-02-07, v3.21.0-rc1~587^2~14) to the 3.20 release series. This is needed since commit 5115dd1e2c (IntelLLVM: Fix C/C++ standard level flags on Windows, 2021-07-07, v3.21.0-rc3~7^2^2) now that we activate C/C++ standard level logic for IntelLLVM when targeting the MSVC ABI.
| * | | | Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC modeBrad King2021-07-091-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 84036d30d4 (IntelLLVM: Fix C/C++ standard level flags on Windows, 2021-07-07, v3.21.0-rc3~8^2~1) we activate C/C++ standard level logic for IntelLLVM when targeting the MSVC ABI. Update the `RunCMake.try_compile` test to be aware of this even when CMake is itself configured by an older CMake that does not know this.
* | | | | Merge topic 'FindJPEG-revert-turbo' into release-3.21Brad King2021-07-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | 0de1f1503b FindJPEG: Revert "Search for 'turbojpeg' and 'turbojpeg-static' too" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6326
| * | | FindJPEG: Revert "Search for 'turbojpeg' and 'turbojpeg-static' too"Brad King2021-07-091-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Revert commit 74cc2e3326 (FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too, 2021-01-09, v3.20.0-rc1~176^2) pending further investigation. The "turbo" variants are not drop-in replacements on all platforms. Fixes: #22333
* | | CMake 3.21.0-rc3v3.21.0-rc3Brad King2021-07-081-1/+1
| | |
* | | Merge topic 'help_toplevel' into release-3.21Brad King2021-07-082-0/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2df4badc5f Help: Note PROJECT_IS_TOP_LEVEL behavior w.r.t. ExternalProject Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6307
| * | | Help: Note PROJECT_IS_TOP_LEVEL behavior w.r.t. ExternalProjectMichael Hirsch2021-07-082-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the documentation added by commit 96a7040107 (project: Define variables indicating whether project is top level, 2021-03-24, v3.21.0-rc1~443^2) to give some examples of how the variables are set in each context.
* | | | Merge topic 'doc-lang-std' into release-3.21Brad King2021-07-083-3/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d69b46bf01 Help: Document when CUDA_STANDARD values were added bdb59839b9 Help: Document when OBJCXX_STANDARD values were added 627aca946b Help: Document when OBJC_STANDARD values as definition list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6321
| * | | | Help: Document when CUDA_STANDARD values were addedBrad King2021-07-081-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that some CUDA C++ language standard levels were added before any compilers actually supported them. In such cases, the value of `CUDA_STANDARD` gracefully degrades to the highest supported by the compiler (unless `CUDA_STANDARD_REQUIRED` is enabled). Therefore we can document support for each value based on when CMake learned of it.
| * | | | Help: Document when OBJCXX_STANDARD values were addedBrad King2021-07-081-1/+21
| | | | |
| * | | | Help: Document when OBJC_STANDARD values as definition listBrad King2021-07-081-1/+10
| | | | |
* | | | | Merge topic 'iar-linker-placeholder' into release-3.21Brad King2021-07-081-7/+7
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | bf810c75ac IAR: Use placeholders in linker and archiver rules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6322
| * | | | IAR: Use placeholders in linker and archiver rulesJean-Marc Hengen2021-07-081-7/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Update the IAR linker and archiver rules to use the `<CMAKE_LINKER>` and `<CMAKE_AR>` placeholders instead of hard-coding the tool names. Fixes: #22395
* | | | Merge topic 'FindCUDAToolkit-doc-version' into release-3.21Brad King2021-07-081-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 266fc8ada5 FindCUDAToolkit: Properly document the version support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6320
| * | | | FindCUDAToolkit: Properly document the version supportRobert Maynard2021-07-071-3/+8
| | | | |
* | | | | Merge branch 'release-3.20' into release-3.21Brad King2021-07-080-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'release-3.19' into release-3.20Brad King2021-07-080-0/+0
| |\ \ \ \
| | * \ \ \ Merge branch 'check_cxx_compiler_flag_no_normal_variable' into release-3.19Brad King2021-07-082-1/+10
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !6318
| * | \ \ \ \ Merge branch 'check_cxx_compiler_flag_no_normal_variable' into release-3.20Brad King2021-07-082-1/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | Merge-request: !6318
* | | | | | | Merge topic 'check_cxx_compiler_flag_no_normal_variable' into release-3.21Brad King2021-07-082-1/+10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 018d300ca0 Check*CompilerFlag: Do not set result as a normal variable too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6318
| * | | | | | Check*CompilerFlag: Do not set result as a normal variable tooRobert Maynard2021-07-082-1/+10
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously fixed by commit d46590910c (Check*CompilerFlag: Do not set result as a normal variable too, 2020-09-21, v3.18.3~1^2^2), but was regressed by refactoring in commit 90dead024c (CheckCompilerFlag: unified way to check compiler flags per language, 2020-09-25, v3.19.0-rc1~88^2) due to the changes being developed concurrently. Fix it again, and add a test case. Fixes: #21207
* | | | | | Merge branch 'release-3.20' into release-3.21Brad King2021-07-080-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20Brad King2021-07-072-12/+4
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | Merge-request: !6319
* | | | | | Merge topic 'intel-oneapi-std-windows' into release-3.21Brad King2021-07-082-10/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13961f3b43 Merge branch 'backport-3.20-intel-oneapi-std-windows' 5115dd1e2c IntelLLVM: Fix C/C++ standard level flags on Windows 84036d30d4 IntelLLVM: Fix C/C++ standard level flags on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6319
| * | | | | Merge branch 'backport-3.20-intel-oneapi-std-windows'Brad King2021-07-070-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | IntelLLVM: Fix C/C++ standard level flags on WindowsBrad King2021-07-072-12/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based compilers, 2020-11-02, v3.20.0-rc1~89^2~20) we accidentally left out activation of the C/C++ standard level selection logic when IntelLLVM is targeting the MSVC ABI. Fixes: #22388
| * | | | IntelLLVM: Fix C/C++ standard level flags on WindowsBrad King2021-07-072-10/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based compilers, 2020-11-02, v3.20.0-rc1~89^2~20) we accidentally left out activation of the C/C++ standard level selection logic when IntelLLVM is targeting the MSVC ABI. Fixes: #22388
* | | | Merge topic 'help_cxxstd' into release-3.21Brad King2021-07-071-1/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5650bebc2f Help: Note CXX_STANDARD values added vs. CMake version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6305
| * | | | Help: Note CXX_STANDARD values added vs. CMake versionMichael Hirsch2021-07-061-1/+25
| | | | |
* | | | | Merge topic 'correct_cuda_toolkit_version_typo' into release-3.21Brad King2021-07-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d54276c82 Correct CUDAToolkit_VERSION_MINOR variable name typo Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6311
| * | | | | Correct CUDAToolkit_VERSION_MINOR variable name typoRobert Maynard2021-07-061-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge topic 'cmake-presets-list-no-generator' into release-3.21Brad King2021-07-076-13/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9a3c9fad5 CMakePresets.json: Make --list-presets show presets with no generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6314
| * | | | | CMakePresets.json: Make --list-presets show presets with no generatorKyle Edwards2021-07-066-13/+23
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #22389
* | | | | Merge topic 'xcode13-old-buildsystem' into release-3.21Brad King2021-07-071-1/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 71a2664ebb Xcode: Ignore deprecated build system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6309
| * | | | Xcode: Ignore deprecated build systemGregor Jasny2021-07-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | With Xcode 13 the key to suppress the check has changed. Tested with Xcode 12.5 and 13.0-beta2.
generated by cgit v0.12 at 2025-09-17 17:57:36 (GMT)