summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindBLAS-LAPACK-All'Brad 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
* | CMake Nightly Date StampKitware Robot2021-07-131-1/+1
| |
* | Merge topic 'LWYU-externalization'Brad King2021-07-1224-53/+206
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 14e57e9637 LINK_WHAT_YOU_USE feature: externalize configuration 9c5132a586 PGI: Fix "LINKER:" prefix generated separator 8a93de080c cmGeneratorTarget: Add method for LINKER: prefix translation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6306
| * | LINK_WHAT_YOU_USE feature: externalize configurationMarc Chevrier2021-07-0921-52/+195
| | | | | | | | | | | | | | | | | | | | | | | | Currently, this feature is only supported on ELF platforms. So, the property LINK_WHAT_YOU_USE will be ignored for other plateforms. Moreover, flags and commands are now controled by CMake variables. Fixes: #20174
| * | PGI: Fix "LINKER:" prefix generated separatorMarc Chevrier2021-07-091-1/+1
| | | | | | | | | | | | | | | Fix a typo from commit 66ea1a3795 (LINK_OPTIONS: Add support of "LINKER:" prefix, 2018-04-30, v3.13.0-rc1~437^2).
| * | cmGeneratorTarget: Add method for LINKER: prefix translationMarc Chevrier2021-07-082-0/+10
| | |
* | | Merge topic 'cpack-rpm-requires-exclude-from'Brad King2021-07-123-0/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bb5fc38209 CPack/RPM: Add option to set %global __requires_exclude_from Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6324
| * | | CPack/RPM: Add option to set %global __requires_exclude_fromLisa Welsch2021-07-093-0/+29
| | | |
* | | | Merge topic 'target-stable-order'Brad King2021-07-125-20/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e9ab61e2f cmGlobalGenerator: Process targets in a stable order 8a812dde61 cmGlobalGenerator: Use cmMakefile::CreateNewTarget to add global targets 854dcb0d01 cmMakefile: Split out CreateNewTarget from AddNewTarget Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6267
| * | | | cmGlobalGenerator: Process targets in a stable orderNAKAMURA Takumi2021-07-082-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | `cmMakefile::Targets` is meant for efficient lookup but does not have a stable order. Use `cmMakefile::OrderedTargets` instead.
| * | | | cmGlobalGenerator: Use cmMakefile::CreateNewTarget to add global targetsNAKAMURA Takumi2021-07-082-10/+13
| | | | | | | | | | | | | | | | | | | | `cmMakefile::CreateNewTarget` updates also `cmMakefile::OrderedTargets`.
| * | | | cmMakefile: Split out CreateNewTarget from AddNewTargetNAKAMURA Takumi2021-07-082-6/+19
| | | | | | | | | | | | | | | | | | | | `CreateNewTarget` tells whether the target is inserted or not.
* | | | | Merge branch 'release-3.21'Brad King2021-07-120-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'release-3.20' into release-3.21Brad King2021-07-120-0/+0
| |\ \ \ \
* | \ \ \ \ Merge branch 'release-3.20'Brad 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 branch 'release-3.21'Brad King2021-07-120-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | 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 topic 'intel-oneapi-std-windows'Brad 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 branch 'release-3.21'Brad King2021-07-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | 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
* | | | | | | | Merge topic 'FindJPEG-revert-turbo'Brad 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
* | | | | | | Merge topic 'ci-hip'Brad King2021-07-125-0/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71ab24015f gitlab-ci: add job testing hip4.2 with Ninja Multi-Config 2e124fa22d ci: add hip4.2 base image Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6329
| * | | | | | | gitlab-ci: add job testing hip4.2 with Ninja Multi-ConfigBrad King2021-07-093-0/+37
| | | | | | | |
| * | | | | | | ci: add hip4.2 base imageBrad King2021-07-092-0/+20
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2021-07-121-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2021-07-111-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2021-07-101-1/+1
|/ / / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2021-07-091-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.21'Brad King2021-07-080-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | CMake 3.21.0-rc3v3.21.0-rc3Brad King2021-07-081-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.21'Brad King2021-07-080-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | \ \ \ \ \ \ Merge topic 'help_toplevel'Brad 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 branch 'release-3.21'Brad King2021-07-080-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
* | \ \ \ \ \ \ \ Merge topic 'doc-lang-std'Brad 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 branch 'release-3.21'Brad King2021-07-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |