summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cuda_host_env'Brad King2022-01-181-9/+9
|\ | | | | | | | | | | | | | | 70f5d9eb49 CUDA: Fix CMAKE_CUDA_COMPILER_ARG1 cache description ad6cd1074b Help: Correct CUDAHOSTCXX and CUDAARCHS as having higher precedence Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6872
| * CUDA: Fix CMAKE_CUDA_COMPILER_ARG1 cache descriptionRaul Tambre2022-01-151-9/+9
| | | | | | | | Also corrected the misleading indentation.
* | Merge topic 'CheckLinkerFlag-update-implementation'Brad King2022-01-184-111/+116
|\ \ | | | | | | | | | | | | | | | | | | | | | 9d1b9a4aa1 CheckLinkerFlag: rely now on internal implementation 660e0d80ae internal/CheckCompilerFlag: rely on common configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6860
| * | CheckLinkerFlag: rely now on internal implementationMarc Chevrier2022-01-142-47/+37
| | | | | | | | | | | | | | | This internal implementation share the configuration with CheckCompilerFlag.
| * | internal/CheckCompilerFlag: rely on common configurationMarc Chevrier2022-01-142-64/+79
| | | | | | | | | | | | | | | Extract configuration step from the CheckCompilerFlag command to enable to share it with future CheckLinkerFlag implementation
* | | Merge topic 'IntelLLVM-windows-link-with-driver'Brad King2022-01-181-0/+13
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 79921fb00c IntelLLVM: Set linker to compiler driver for Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6866
| * | IntelLLVM: Set linker to compiler driver for WindowsWilliam R. Dieter2022-01-141-0/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | For IntelLLVM, linking with the compiler driver is preferred over using the linker directly. This is especially true when doing offload to a target accelerator, which can produce object files that the regular linker will not handle properly. Windows-IntelLLVM relies on Windows-MSVC.cmake for many definitions. This commit does not change that, but does override the MSVC defaults for linking executables, shared libraries, and static libraries so that CMake will use the compiler driver instead of the linker. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | Merge topic 'cudatoolkit_find_cufft_static_nocallback'Brad King2022-01-131-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | a4126d1c01 CUDAToolkit: Add CUDA::cufft_static_nocallback target Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6856
| * | CUDAToolkit: Add CUDA::cufft_static_nocallback targetRobert Maynard2022-01-121-0/+4
| |/ | | | | | | Fixes: #23098
* | FindCUDAToolkit: depend cublas on cublasLt for CUDA 11.0+Robert Maynard2022-01-121-0/+7
|/
* Merge topic 'msvc-isystem'Brad King2022-01-122-2/+2
|\ | | | | | | | | | | | | 3a8b6653dc MSVC: Use -external:I flag without space to support Clang tools Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6855
| * MSVC: Use -external:I flag without space to support Clang toolsBrad King2022-01-112-2/+2
| | | | | | | | | | | | | | | | | | | | Since commit f29e1874ad (Compiler/MSVC: use the `-external:I` flag for system includes, 2020-05-19, v3.22.0-rc1~593^2) we use the new flag followed by the include directory as a separate argument. Some versions of `clang-cl` and `clang-tidy` do not support the flag unless the include directory is attached to it, so use that form instead. Fixes: #22979
* | Merge topic 'GoogleTest-discover-sq-brackets'Brad King2022-01-121-13/+55
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 8b85b10fb3 GoogleTest: Add handling for square brackets in test names 8f977a5c92 GoogleTest: Generalize test samples Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6842
| * | GoogleTest: Add handling for square brackets in test namesEvgeniy Shcherbina2022-01-111-13/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a test name contains a square bracket (due to parameters) then it breaks gtest_discovery_test() function in some not-so-predictable way. That happens due to the special meaning these brackets have in the CMake language and they can't be escaped universally. So the following treatment has been implemented: * Every occurrence of ('[' | ']') in a test name gets replaced with the corresponding placeholder ("__osb_*" | "__csb_*") before the Google Test output processing and gets replaced back before adding a new test to CTest, keeping the original test name intact in the CTest output. The placeholders are chosen that way to minimize the chance of clashing with something in the user tests but even if the default ones would clash with something then they are enhanced to not clash with anything (hence "_*" at the placeholder's end). * The GTest output gets searched for the default test name guards ("[=[" | "]=]") and if they are found a new one gets generated until the one is found which can safely encompass any test name. The search is quite simple: find the least amount of '=' which would allow escaping any test. * The resulting ${TEST_LIST} variable will contain every test but tests with square brackets as there is no way to make sure such tests won't break the list altogether. Fixes: #23039
* | | Merge topic 'FindLTTngUST-fix-version-detect'Brad King2022-01-111-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4ce5765a86 FindLTTngUST: Fix version component extraction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6828
| * | | FindLTTngUST: Fix version component extractionNorbert Lange2022-01-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The regex was greedy and slurped away all but the last digit, so 2.13.1 was for ex. detected as 2.3.1. Fix this by expecting preceding whitespace.
* | | | Fortran: Support searching for the `nvfortran` executableRobert Maynard2022-01-101-2/+4
| |/ / |/| | | | | | | | Instead of relying on the PGI symlinks (pgf95/pgf90/...) to always exist.
* | | ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checksCraig Scott2022-01-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was originally made in 404cddb7bb (ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks, 2021-02-21), but was reverted by 57d442e182 (Revert ExternalProject and FetchContent refactoring, 2021-03-10) due to regressions from other changes. Reapply this fix on its own, since it is still valid. When using a file system which only has second resolution timestamps, there is a reasonably high likelihood of timestamps being the same. The IS_NEWER_THAN test returns true when timestamps are the same, so don't redo downloads when they match exactly.
* | | Merge topic 'GoogleTest-dots'Brad King2022-01-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1f9554d4e9 GoogleTest: Fix regex matching all dots in the suite name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6822
| * | | GoogleTest: Fix regex matching all dots in the suite nameFrancesco Guastella2022-01-071-1/+1
| |/ /
* | | Merge topic 'cmcldeps-cross'Brad King2022-01-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d49e168e1b Ninja: Do not use cmcldeps for RC on non-Windows hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Dmitry Mikushin <dmitry@kernelgen.org> Merge-request: !6843
| * | | Ninja: Do not use cmcldeps for RC on non-Windows hostsMartin Storsjö2022-01-061-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | The `cmcldeps` executable is only built on Windows. If running MSVC on a different OS (with various compatibility wrapping), don't try to use `cmcldeps`, as the executable doesn't exist. Fixes: #21760
* | | Merge topic 'msvc-arm64ec'Brad King2022-01-071-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 26f52508f2 MSVC: update arm64ec default flags and lib Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6841
| * | | MSVC: update arm64ec default flags and libmoyo19972022-01-061-1/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the support added by commit 4ea3a88625 (MSVC: Add support for targeting ARM64EC, 2020-12-30, v3.20.0-rc1~121^2). Add `softintrin.lib` to `CMAKE_C_STANDARD_LIBRARIES_INIT`. Remove `/D_ARM64EC_WORKAROUND` from the flags as it was only ever needed in preview versions of VS. Issue: #21724
* | | Merge topic 'armasm-6.17'Brad King2022-01-071-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | c2777ed008 ASM: Fix identification of armasm 6.17+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6833
| * | ASM: Fix identification of armasm 6.17+Jukka Jalkanen2022-01-061-1/+1
| | | | | | | | | | | | Spelling of "ARM Compiler" changed to "Arm Compiler".
| * | Merge topic 'FindBoost-1.78' into release-3.22Brad King2021-12-211-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | d45667d459 FindBoost: Do not warn about now-supported version 1.78 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6819
* | | | CheckCompilerFlags: Catch linker warning about ignored flagsCraig Scott2022-01-021-0/+1
| |_|/ |/| | | | | | | | | | | | | | | | | Example warning from arm64 macOS that this will now catch: ld: warning: -no_pie ignored for arm64 Fixes: #22961
* | | Merge topic 'cpack-freebsd-pkg'Brad King2021-12-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3715e08e4 FreeBSD: tidy up a76f19d5e8 FreeBSD: handle new package-file-suffix d5ae2f9754 FreeBSD: fix up the package name 0ac1ac798e FreeBSD: migrate to newer pkg_create(3) API Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Semphriss <dev.semphris@gmail.com> Merge-request: !5854
| * | | FreeBSD: fix up the package nameAdriaan de Groot2021-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using libpkg, the output filename is determined by libpkg itself, based on information in the manifest: package name and version, basically. This doesn't necessarily match the name that CMake has determined via CPACK_TEMPORARY_PACKAGE_FILE_NAME or CPACK_PACKAGE_FILE_NAME. So reset the CMake-determined list to match what libpkg will do.
* | | | Merge topic 'FindGLUT-include-dirs'Brad King2021-12-211-18/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fda93faf8 FindGLUT: Provide modern-named GLUT_INCLUDE_DIRS result variable 641b3f4101 FindGLUT: Modernize documentation layout 924b2999a1 FindGLUT: Move mark_as_advanced calls closer to find calls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6820
| * | | | FindGLUT: Provide modern-named GLUT_INCLUDE_DIRS result variableBrad King2021-12-201-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this module only provided `GLUT_INCLUDE_DIR`, which does not follow the modern naming convention documented in `cmake-developer(7)`. Issue: #23018
| * | | | FindGLUT: Modernize documentation layoutBrad King2021-12-201-12/+20
| | | | |
| * | | | FindGLUT: Move mark_as_advanced calls closer to find callsBrad King2021-12-201-3/+4
| |/ / /
* | | | Merge topic 'FindBoost-1.78'Brad King2021-12-211-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | d45667d459 FindBoost: Do not warn about now-supported version 1.78 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6819
| * | FindBoost: Do not warn about now-supported version 1.78Brad King2021-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | In commit d176ff71c0 (FindBoost: Add support for Boost 1.78, 2021-12-15) we forgot to update the future-version check. Issue: #23016
* | | Merge topic 'FindGLUT-include-dirs'Brad King2021-12-201-0/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | ae6b25d920 FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6814
| * | FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code pathBrad King2021-12-171-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if available, 2021-06-11, v3.22.0-rc1~469^2) we return early if pkg-config provides the information. During review of that commit, code to populate the legacy `GLUT_INCLUDE_DIR` result variable was removed from that code path. Add code to provide it. Also fix the test case to use `GLUT_INCLUDE_DIR`, the result variable documented officially by the module. Fixes: #23018
| * Merge topic 'FindBoost-python-3.10' into release-3.22Brad King2021-12-171-6/+6
| |\ | | | | | | | | | | | | | | | | | | d4bb6c0c7f FindBoost: Add support for Python 3.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6809
| * \ Merge topic 'vs-intel-oneapi-toolset' into release-3.22Brad King2021-12-171-5/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 612c0d49f4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6806
* | \ \ Merge topic 'googletest-executor-error'Brad King2021-12-201-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f51987d42 GoogleTest: show test executor in error message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6813
| * | | | GoogleTest: show test executor in error messagePaul-Antoine Arras2021-12-171-1/+6
| | | | | | | | | | | | | | | | | | | | Fixes: #22920
* | | | | Merge topic 'FindGSL-version-regex'Brad King2021-12-201-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 58f2708b90 FindGSL: Improve version extraction regex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6812
| * | | | FindGSL: Improve version extraction regexمهدي شينون (Mehdi Chinoune)2021-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes: #23017
* | | | | Merge topic 'FindBoost-python-3.10'Brad King2021-12-171-6/+6
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | d4bb6c0c7f FindBoost: Add support for Python 3.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6809
| * | | | FindBoost: Add support for Python 3.10Oleg Sidorkin2021-12-161-6/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Regexps in FindBoost assumed that python's minor version had only one digit. That became not true for 3.10. Fixes: #23025
* | | | Merge topic 'vs-intel-oneapi-toolset'Brad King2021-12-171-5/+3
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | 612c0d49f4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6806
| * | VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021William R. Dieter2021-12-151-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added by commit 7808cbd644 (CMakeDetermineCompilerId: support Intel DPC++ compiler toolset for VS gen, 2020-12-06, v3.20.0-rc1~330^2) matches a specific toolset known to be the `icx.exe` compiler, and assumes all other Intel C++ compilers (that are not DPC++) must be `icl.exe`. Since `icx.exe` is officially replacing `icl.exe`, use a regex that matches the now-fixed set of toolsets known to use `icl.exe`. Any other Intel C++ compiler will be assumed to be `icx.exe`. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | Merge topic 'FetchContent-doc-typo'Brad King2021-12-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ed9ac756e8 FetchContent: Fix typo in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6803
| * | | FetchContent: Fix typo in documentationJukka Aho2021-12-151-1/+1
| | | |
generated by cgit v0.12 at 2025-02-13 15:58:15 (GMT)