summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cuda-arch-all'Brad 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 'genex-LINK_GROUP'Brad King2022-03-011-2/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 0a81ea1f12 Genex-LINK_GROUP: Add possibility to group libraries at link step a9928eb4a5 SunPro C: ensure LINKER: prefix is usable for all versions 01ff75b2ff cmComputeDepends::LinkEntry: introduce enum to specify item type Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7005
| * | SunPro C: ensure LINKER: prefix is usable for all versionsMarc Chevrier2022-02-271-2/+7
| | |
* | | Merge topic 'FindThreads-revert-libc-pthread-flag'Brad 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
* | | Merge topic 'ghs_fix_rtos_dir'Brad King2022-02-241-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 005c7dc9e7 GHS: Store full path of Integrity OS directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7017
| * | 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).
* | | Merge topic 'cpack-zstd-parallel'Brad King2022-02-241-6/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 525faec4e9 CPack: Add parallel zstd compression 215c4efd3e cmArchiveWrite: Factor out thread count selection 29f63129be CPack: Format CPACK_THREADS compression methods as a definition list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7003
| * | | CPack: Add parallel zstd compressionRussell Greene2022-02-231-0/+6
| | | |
| * | | CPack: Format CPACK_THREADS compression methods as a definition listBrad King2022-02-221-6/+11
| | | | | | | | | | | | | | | | Prepare to add more entries beyond `xz`.
* | | | Merge topic 'CheckTypeSize-doc'Brad King2022-02-221-29/+36
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 65e4d29e35 CheckTypeSize: Modernize and clarify documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7006
| * | | 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
* | | | | ExternalProject: Remove extra quotes in for-each-ref update stepCraig Scott2022-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --format=... argument to git for-each-ref was using a stray pair of single quotes around the format string. These were then part of the output, which caused it to never match the checkout_name. The end result was that a REBASE_CHECKOUT always became a CHECKOUT in all scenarios. Fixes: #23216
* | | | | Help: Clarify behavior of REBASE_CHECKOUT when switching branchesCraig Scott2022-02-211-0/+4
| |_|/ / |/| | | | | | | Issue: #23216
* | | | genex-LINK_LIBRARY: rename configuration variablesMarc Chevrier2022-02-165-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | To be more consistent between genex and variables as well as the forecomming LINK_GROUP genex, rename variable *_LINK_USING_<FEATURE>* in *_LINK_LIBRARY_USING_<FEATURE>*
* | | | Merge topic 'FindGLUT-link-dirs'Brad 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
* | | | Merge topic 'FindHDF5-info-binary-exists'Brad King2022-02-161-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 449f343498 FindHDF5: Tolerate failure during compiler interrogation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6983
| * | | 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
| * | | 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
| * \ \ \ Merge topic 'GoogleTest-discovery-fix-escaping' into release-3.23Brad King2022-02-141-24/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61929f936f GoogleTest: Fix escaping in test names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6965
* | \ \ \ \ Merge topic 'LINK_LIBRARY-framework'Brad King2022-02-164-0/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2cfa2da4f GenEx/LINK_LIBRARY: Add features for framework support on Apple 40178f3c90 cmGlobalGenerator: Add helper to split framework path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6967
| * | | | | | GenEx/LINK_LIBRARY: Add features for framework support on AppleMarc Chevrier2022-02-154-0/+56
| | | | | | |
* | | | | | | Merge topic 'cpack-rpm-component-var-off'Brad King2022-02-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 114a04f89c CPack/RPM: Honor CPACK_RPM_<component>_PACKAGE_ variables when set OFF Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6963
| * | | | | | | CPack/RPM: Honor CPACK_RPM_<component>_PACKAGE_ variables when set OFFPhilip Bailey2022-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23182
* | | | | | | | Merge topic 'FindMatlab-mcr911'Brad 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'Brad 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
| * | | | | | | | FortranCInterface: Fix mangling detection for x86_64 on arm64 macOSBrad King2022-02-112-0/+19
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #23218
| * | | | | | | Merge topic 'clang-cross-compile-windows-pdb' into release-3.23Brad King2022-02-101-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 641cb1093b Windows/Clang: Support PDB when cross-compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !6959
* | \ \ \ \ \ \ \ Merge topic 'GoogleTest-discovery-fix-escaping'Brad King2022-02-141-24/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | 61929f936f GoogleTest: Fix escaping in test names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6965
| * | | | | | | GoogleTest: Fix escaping in test namesEvgeniy Shcherbina2022-02-111-24/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to add_command() being a macro it introduced excessive and nonobvious escaping in different parts of the script. Because of one of such places the resulting script would have an erroneous ${TEST_LIST} if the user data (in test parameters) had a semicolon. To eliminate this non-obvious escaping, add_command() was converted to function. Updated the escaping accordingly. Fixes: #23059
* | | | | | | | Merge topic 'clang-cross-compile-windows-pdb'Brad King2022-02-101-0/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 641cb1093b Windows/Clang: Support PDB when cross-compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !6959
| * | | | | | | Windows/Clang: Support PDB when cross-compilingDeniz Bahadir2022-02-081-0/+1
| |/ / / / / /
* | | | | | | Merge topic 'IntelLLVM-depfile-flags'Brad King2022-02-103-3/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e947fcb83 Merge branch 'backport-IntelLLVM-depfile-flags' into IntelLLVM-depfile-flags a8b6bf9a38 IntelLLVM: Add dependencies on system header files on Windows 94f1bbdd54 Intel: Add dependencies on system header files on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6964
| * | | | | | Merge branch 'backport-IntelLLVM-depfile-flags' into IntelLLVM-depfile-flagsBrad King2022-02-093-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | IntelLLVM: Add dependencies on system header files on WindowsWilliam R. Dieter2022-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based compilers, 2020-11-02, v3.20.0-rc1~89^2~20) the IntelLLVM depfile generation flags were taken from `Platform/Windows-Intel-C`. Those flags were added by commit a624a3e1b3 (Ninja: Use deps=gcc for Intel Compiler on Windows, 2019-01-30, v3.14.0-rc1~30^2), which forgot to account for commit 6d74e7870b (Ninja: Add dependencies on system-provided header files, 2016-03-15, v3.6.0-rc1~265^2). The `-QMD` option generates Makefile dependencies. The `-QMMD` option generates Makefile dependencies, but excludes system header files. Part of the BuildDepends test includes a header, cmake_pch.hxx, that includes a second header, zot_pch.hxx. The test builds a pch file for cmake_pch.hxx, touches zot_pch.hxx, then verifes that cmake_pch.hxx.pch is regenerated based on the dependencies. The cmake_pch.hxx contains `#pragma system_header` before it includes zot_pch.hxx. `#pragma system_header` indicates that the portion of the file following the pragma is to be treated as a system header. When `-QMMD` is used to generate dependencies, the `#include` of zot_pch.hxx is ignored because it `-QMMD` says to ignore system headers. Using `-QMD` instead uses all headers when generating dependencies and causes this test to pass. The Clang configuration in Platform/Windows-Clang.cmake also uses the `-MD` option for generating pre-compiled headers, instead of `-MMD`. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
| | * | | | Intel: Add dependencies on system header files on WindowsBrad King2022-02-092-2/+2
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a624a3e1b3 (Ninja: Use deps=gcc for Intel Compiler on Windows, 2019-01-30, v3.14.0-rc1~30^2) we forgot to account for commit 6d74e7870b (Ninja: Add dependencies on system-provided header files, 2016-03-15, v3.6.0-rc1~265^2).
| * | | | Merge topic 'GoogleTest-discover-type-params' into release-3.23Brad King2022-02-081-3/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 073dd1bd81 GoogleTest: Change format for typed tests f28f738bd2 GoogleTest: Fix type param tests for suites with many cases Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6958
| * \ \ \ \ Merge topic 'default-extensions' into release-3.23Brad King2022-02-043-7/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ef6e27cb9 CompilerId: Fix default extensions check for Clang targeting MSVC ABI Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6949
| * | | | | Merge topic 'ep-patch-USES_TERMINAL' into release-3.23Brad King2022-02-043-2/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbb87e0a2c ExternalProject: Add support for USES_TERMINAL_PATCH keyword Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6940
* | \ \ \ \ \ Merge topic 'genex-LINK_LIBRARY-to-decorate-library'Brad King2022-02-091-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a6b0415d7 $<LINK_LIBRARY>: Add LINK_LIBRARY_OVERRIDE target property 42965799b4 Genex: Add $<LINK_LIBRARY:...> 78dd7d5292 cmRulePlaceholderExpander: add base class for placeholder expansion reuse 4b55828a9f cmExpandListWithBacktrace: add handling of empty elements. 28d7432468 cmComputeLinkInformation: use cmComputeLinkDepends::LinkEntry Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6769
| * | | | | | | $<LINK_LIBRARY>: Add LINK_LIBRARY_OVERRIDE target propertyMarc Chevrier2022-02-081-0/+6
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To enable the management of incompatible $<LINK_LIBRARY> declarations, add LINK_LIBRARY_OVERRIDE and LINK_LIBRARY_OVERRIDE_<LIBRARY> target properties.
* | | | | | | Merge topic 'GoogleTest-discover-type-params'Brad King2022-02-081-3/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 073dd1bd81 GoogleTest: Change format for typed tests f28f738bd2 GoogleTest: Fix type param tests for suites with many cases Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6958
generated by cgit v0.12 at 2025-02-21 22:06:46 (GMT)