summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'productbuild-rootVolumeOnly' into release-3.23Brad King2022-03-221-6/+5
|\ | | | | | | | | | | | | | | | | 2a8df7e7db productbuild: Don't write rootVolumeOnly attribute if writing domains 95eb8cbcfc CPack: Avoid space / tab mix in productbuild distribution.xml template 28fdc3a536 productbuild: Simplify internal CPACK_PRODUCTBUILD_DOMAINS usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7092
| * productbuild: Don't write rootVolumeOnly attribute if writing domainsCraig Scott2022-03-211-2/+1
| | | | | | | | | | | | The rootVolumeOnly attribute is deprecated. Apple docs say to use domains instead. Fixes: #23343
| * CPack: Avoid space / tab mix in productbuild distribution.xml templateCraig Scott2022-03-211-6/+6
| |
* | Merge topic 'cpack-nsis-fix-uninstall-quoting' into release-3.23Brad King2022-03-221-3/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | 5d2ceaada8 CPack/NSIS: Add support for unquoted (legacy) uninstaller strings b795c96727 CPack/NSIS: Fix uninstall command when run from installer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7096
| * | CPack/NSIS: Add support for unquoted (legacy) uninstaller stringsMarc Jeanmougin2022-03-211-0/+4
| | |
| * | CPack/NSIS: Fix uninstall command when run from installerMarc Jeanmougin2022-03-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | The quoting introduced by commit eb3b3bacdc (CPack/NSIS: Fix uninstall on Windows using "Apps & Features", 2021-09-13, v3.22.0-rc1~136^2) created two errors in the uninstaller call: double quoting of the uninstaller executable, and quotes added to the `_?=` argument which does not support them. Simplify the command.
* | | FindCUDAToolkit: Add missing cufftw_static targetRobert Maynard2022-03-211-1/+1
| |/ |/| | | | | Fixes #23347
* | FindMatlab: Add R2022a => 9.12 versionMichael Hirsch2022-03-181-0/+1
| |
* | Merge topic 'FindPython-pypy-specify-versions' into release-3.23Brad King2022-03-181-10/+25
|\ \ | |/ | | | | | | | | | | 2834cea155 FindPython: fix various problems using pypy interpreters Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7081
| * FindPython: fix various problems using pypy interpretersMarc Chevrier2022-03-171-10/+25
| | | | | | | | | | | | * add more possible directories for include file search * enhance version detection from library and include files * search for file pypy_decl.h when PyPy.h is not defined
| * Merge branch 'binutils-llvm-ar-apple' into release-3.22Brad King2022-03-161-1/+6
| |\ | | | | | | | | | Merge-request: !7077
| * \ Merge branch 'AppleClang-cxx20-cxx23-flags' into release-3.22Brad King2022-03-111-1/+9
| |\ \ | | | | | | | | | | | | Merge-request: !7063
* | | | FindPostgreSQL: Update known versions in documentationKai Pastor2022-03-171-1/+1
| | | |
* | | | Merge topic 'doc-list-semicolons' into release-3.23Brad King2022-03-161-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8abd714176 Help: Clarify that ENVIRONMENT test properties take ;-separated lists 02cf404ace Help: Add advice for dealing with semicolons in lists c4117d9116 ExternalProject: Document that LIST_SEPARATOR works for CMAKE_ARGS too Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !7066
| * | | | ExternalProject: Document that LIST_SEPARATOR works for CMAKE_ARGS tooBrad King2022-03-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `CMAKE_ARGS` is used to construct the default `CONFIGURE_COMMAND` for CMake-based external projects, the `LIST_SEPARATOR` option works for it too.
* | | | | Merge topic 'binutils-llvm-ar-apple' into release-3.23Brad King2022-03-161-1/+6
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | fee36b7a78 BinUtils: Restore llvm-ar fallback on Apple platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7077
| * | | | BinUtils: Restore llvm-ar fallback on Apple platformsBrad King2022-03-161-1/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 29ea94e17c (BinUtils: Avoid llvm-ar on Apple platforms, 2022-03-03, v3.21.6~1^2) we do not consider `llvm-ar` at all on Apple platforms. However, there are existing cross-compiling use cases in which the toolchain has `llvm-ar` but not `ar`. Prior to the re-ordering in commit cf82300a63 (BinUtils: Clarify search logic and make it more consistent, 2021-05-27, v3.21.0-rc1~119^2~2), we preferred `ar` and then `llvm-ar`. Restore the original order for Apple. Fixes: #23320
* | | | Merge topic 'AppleClang-cxx20-cxx23-flags' into release-3.23Brad King2022-03-151-1/+9
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | 683e4e9cab AppleClang: Add C++20 and C++23 flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7063
| * | AppleClang: Add C++20 and C++23 flagsKen Matsui2022-03-111-1/+9
| | | | | | | | | | | | | | | Follow up commit 886e27062b (Clang/MSVC: C++20 final flag, C++23 support, 2021-05-29, v3.20.4~7^2) with support for AppleClang.
* | | Merge topic 'cuda-arch-off' into release-3.23Brad King2022-03-102-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7024596a26 Tests: Fix testing CMAKE_CUDA_ARCHITECTURES=OFF with Clang 2a79b647fa CUDA: Restore support for CMAKE_CUDA_ARCHITECTURES=OFF Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7058
| * | | CUDA: Restore support for CMAKE_CUDA_ARCHITECTURES=OFFRobert Maynard2022-03-092-3/+3
| | | | | | | | | | | | | | | | Fixes: #23309
* | | | Merge topic 'irsl-oneapi-linux' into release-3.23Brad King2022-03-101-0/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | 3e84a06b3a IRSL: Add paths for Intel oneAPI compilers on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7057
| * | IRSL: Add paths for Intel oneAPI compilers on LinuxAttila Krasznahorkay2022-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are stored in a slightly different place with oneAPI than they used to be in PSXE. A similar change was made for Windows by commit 956160bb9a (IRSL: Fix search for Windows redist files with Intel Classic compiler, 2021-09-23, v3.22.0-rc1~88^2), which left a comment about the locations relative to the Classic and oneAPI compilers. Fixes: #23310
| * | Merge branch 'binutils-llvm-mt' into release-3.22Brad King2022-03-081-1/+2
| |\ \ | | |/ | | | | | | Merge-request: !7054
* | | Merge topic 'binutils-llvm-mt' into release-3.23Brad King2022-03-091-1/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 73d0d4e4b5 BinUtils: Avoid llvm-mt because it is missing 'mt' features we use Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7054
| * | BinUtils: Avoid llvm-mt because it is missing 'mt' features we useBrad King2022-03-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit cf82300a63 (BinUtils: Clarify search logic and make it more consistent, 2021-05-27, v3.21.0-rc1~119^2~2) we correctly prefer the more-specific name `llvm-mt` over `mt` when using Clang. However, the `llvm-mt` tool does not yet support all the flags we need in the implementation of `vs_link_{exe,dll}`. Prefer plain `mt` for now. Fixes: #23305
* | | IAR: Fix detection of modern C++ versionKenneth Soerensen2022-03-081-1/+3
| | | | | | | | | | | | | | | | | | | | | The change in commit cc4da8d13a (IAR/CXX: Fix compatibility with CMP0057 OLD, 2022-01-29, v3.23.0-rc1~46^2) broke the detection of C++ version because the `IN_LIST` operator cannot work directly on a list but requires a variable.
* | | Merge topic 'FindMatlab-minver' into release-3.23Brad King2022-03-081-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | bb2c7b7dc0 FindMatlab: Fix logic error when minimum version is not found Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7047
| * | FindMatlab: Fix logic error when minimum version is not foundMichael Hirsch2022-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic added by commit 7fdd5128b1 (FindMatlab: Fix version selection if a version is given, 2021-07-02, v3.22.0-rc1~66^2). Ensure that `_list_index` is always initialized to -1, akin to `list(FIND)` not finding a match. Issue: #22377
| * | Merge branch 'binutils-llvm-ar-clang-macos' into release-3.22Brad King2022-03-031-1/+4
| |\ \ | | |/ | | | | | | Merge-request: !7039
| * | Merge branch 'FindThreads-revert-libc-pthread-flag' into release-3.22Brad King2022-02-281-11/+8
| |\ \ | | | | | | | | | | | | Merge-request: !7025
* | \ \ Merge topic 'binutils-llvm-ar-clang-macos' into release-3.23Brad King2022-03-041-1/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 29ea94e17c BinUtils: Avoid llvm-ar on Apple platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7039
| * | | BinUtils: Avoid llvm-ar on Apple platformsBrad King2022-03-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit cf82300a63 (BinUtils: Clarify search logic and make it more consistent, 2021-05-27, v3.21.0-rc1~119^2~2) we correctly prefer the more-specific name `llvm-ar` over `ar` when using Clang. However, on Apple platforms, `llvm-ar` does not generate a symbol table that the Apple linker accepts. Fall back to `ar` on Apple platforms. Fixes: #23269
| * | | Merge branch 'FindThreads-revert-libc-pthread-flag' into release-3.21Brad King2022-02-281-11/+8
| |\ \ \ | | | |/ | | |/| | | | | Merge-request: !7025
* | | | VS: Fix CUDA compiler id with CMAKE_CUDA_ARCHITECTURES={all,all-major}Brad King2022-03-022-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip the architecture verification check for these values on Visual Studio. It cannot be implemented correctly until future work delays the check to the main compiler test step. Issue: #23164, #23161
* | | | Merge topic 'cuda-arch-all' into release-3.23Brad King2022-03-021-21/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2796d6eeca CUDA: Fix CMAKE_CUDA_ARCHITECTURES=all/all-major with NVCC 11.5+ e450d55552 Help: Update CUDA_ARCHITECTURES docs for generic all/all-major support fe64c49e72 CUDA: Simplify CMAKE_CUDA_ARCHITECTURES special value logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7026
| * | | | CUDA: Fix CMAKE_CUDA_ARCHITECTURES=all/all-major with NVCC 11.5+Brad King2022-03-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit 8f64df0a7c (CUDA: Generic all and all-major support, 2021-12-19, v3.23.0-rc1~23^2) broke our architecture verification checks when using `-arch={all,all-major}` with NVCC 11.5+. If we test the compiler with `-arch={all,all-major}`, we have no expected list of architectures, so skip the check. Fixes: #23278
| * | | | CUDA: Simplify CMAKE_CUDA_ARCHITECTURES special value logicBrad King2022-03-011-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the logic checking `CMAKE_CUDA_ARCHITECTURES` special values. Switch on the value first, and then make other decisions for each case. This makes room for other special values to be added later.
* | | | | Merge topic 'FindThreads-revert-libc-pthread-flag' into release-3.23Brad King2022-03-011-11/+8
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | c6da90bd39 FindThreads: Revert "Honor THREADS_PREFER_PTHREAD_FLAG when ... in libc" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7025
| * | | FindThreads: Revert "Honor THREADS_PREFER_PTHREAD_FLAG when ... in libc"Brad King2022-02-281-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 5efb6fb516 (FindThreads: Honor THREADS_PREFER_PTHREAD_FLAG when pthread is found in libc, 2021-11-03, v3.21.5~4^2). The check for the `-pthread` flag can pass on compilers like XL, that interprets it as `-p -t hread` and returns zero. Prior to that commit, we did not use the check in the `CMAKE_HAVE_LIBC_PTHREAD` code path. Now we do, it succeeds, and we incorrectly add the `-pthread` flag for XL. This change was backported to the 3.21 and 3.22 release series long after they initially came out. Since there may be more cases where we now add `-pthread` incorrectly, it is simplest to revert the change in all release series pending further investigation. Fixes: #23270
* | | | GHS: Store full path of Integrity OS directoryFred Baksik2022-02-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes build project error because the OS directory was a relative path from the binary directory. Fixes issue during project regeneration where the `-os_dir` project option was missing because GHS_OS_DIR was not properly stored in the cache file. This error was introduced by commit aa59eaac4f (GHS: Allow setting GHS variables from toolchain file, 2021-11-15, v3.23.0-rc1~337^2).
* | | | CheckTypeSize: Modernize and clarify documentationBrad King2022-02-181-29/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Spell out the list of result variables as a definition list rather than in prose. Fixes: #23247
* | | | Merge topic 'FindGLUT-link-dirs' into release-3.23Brad King2022-02-161-0/+3
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 44f7238d5d FindGLUT: Use link directories for libs from pkg-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6985
| * | | FindGLUT: Use link directories for libs from pkg-configSilvio Traversaro2022-02-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if available, 2021-06-11, v3.22.0-rc1~469^2), the `GLUT_LIBRARIES` may come from `pkg-config`, in which case they may be `-l` flags instead of absolute paths. Propagate `GLUT_LIBRARY_DIRS` to GLUT::GLUT too. Fixes: #23229
* | | | FindHDF5: Tolerate failure during compiler interrogationAxel Huebl2022-02-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that the file that is accessed via `file(STRINGS...)` truly exists. This is not the case in some EMSCRIPTEN/WebASM builds where we want to overwrite the HDF5 find logic manually. The missing check here prevents that one can overwrite the search logic in exotic environments.
* | | | Merge topic 'FindMatlab-mcr911' into release-3.23Brad King2022-02-151-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | b8d885ed0d FindMatlab: Fix version detection for MCR >= 9.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6976
| * | | FindMatlab: Fix version detection for MCR >= 9.10Tom M2022-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent MCR versions have the following `VersionInfo.xml`: <version>9.11.0.1837725</version> Fix parsing of multiple digits in the version components so that we do not mistake this for version `9.1`.
| * | | Merge branch 'backport-IntelLLVM-depfile-flags' into release-3.22Brad King2022-02-093-3/+3
| |\ \ \ | | | |/ | | |/| | | | | Merge-request: !6964
| * | | FindGSL: Improve version extraction regexمهدي شينون (Mehdi Chinoune)2022-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport commit 58f2708b90 (FindGSL: Improve version extraction regex, 2021-12-17) to the CMake 3.22 branch. Fixes: #23017
* | | | Merge topic 'FortranCInterface-macos-arch' into release-3.23Brad King2022-02-142-0/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58af150a74 FortranCInterface: Fix mangling detection for x86_64 on arm64 macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6974