summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* CUDA: Add support for finding nvcc in CUDA_PATHTobias Ribizel2021-03-152-0/+12
| | | | | | Previously, nvcc needed to be present in PATH or specified by CUDACXX. On Windows with vcpkg, the PATH is heavily modified, which lead to nvcc not being found with the Ninja generator.
* CMakePrintHelpers: Work around CACHE argument of set()Kyle Edwards2021-03-111-1/+4
| | | | Fixes: #21919
* Merge topic 'cray-compiler-wrapper-detection'Brad King2021-03-113-5/+5
|\ | | | | | | | | | | | | 13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5897
| * Cray: Enable Cray compiler wrapper detection on all platformsJustin LaPolla2021-03-103-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously were checking for the `__CRAYXC` and `__CRAYXE` predefined macros. These macros reflect the platform that the compiler wrapper is running on, i.e. Cray XC and Cray XE machines. They are not defined on other platforms such as Apollo80. Switch to the `__CRAYXT_COMPUTE_LINUX_TARGET` macro. The Cray cc/CC/ftn wrappers always define this macro on the command line. This macro has been in use for many years, and is believed to be a reliable way to detect current and older Cray compiler wrappers. Fixes: #21904
* | Merge topic 'ep-fc-revert-refactoring'Brad King2021-03-1020-1782/+1087
|\ \ | | | | | | | | | | | | | | | | | | 57d442e182 Revert ExternalProject and FetchContent refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5898
| * | Revert ExternalProject and FetchContent refactoringCraig Scott2021-03-0920-1782/+1087
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring of the ExternalProject and FetchContent modules moved the commands into CMake scripts. This broke custom commands that used shell redirection or special build tool variables of the form $(MakeVar). Undo the sequence of commits that performed this refactoring and follow-up fixes associated with it. The following commits are reverted by this change: 4f3d1abbb4 (ExternalProject: Refactor pre-configure steps to support no-target uses, 2021-02-05) 17e5516e60 (FetchContent: Invoke steps directly and avoid a separate sub-build, 2021-01-29) bd876f3849 (FetchContent: Restore patch command support, 2021-02-18) 404cddb7bb (ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks, 2021-02-21) b0da671243 (FetchContent: Don't update timestamps if files don't change, 2021-02-18) Fixes: #21892
* | | Merge topic 'FindMatlab-MCR-vars'Brad King2021-03-101-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5ba1f4b6ee FindMatlab: Fix Matlab_LIBRARIES for MCR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5896
| * | | FindMatlab: Fix Matlab_LIBRARIES for MCRSilvio Traversaro2021-03-091-2/+9
| |/ / | | | | | | | | | | | | | | | | | | In commit bda5e2ac8f (FindMatlab: Only include engine and dataarray libraries if they are found, 2020-12-11, v3.20.0-rc1~297^2~1) we fixed the imported target to contain optional libraries only if they are found. Do the same for `Matlab_LIBRARIES`.
| * | Merge topic 'CrayPrgEnv-detection' into release-3.20Brad King2021-03-093-5/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | 23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5889
* | | Merge topic 'CrayPrgEnv-detection'Brad King2021-03-093-5/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5889
| * | Revert "Cray: Fix Cray compiler detection on new platforms"Brad King2021-03-083-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The justification in commit 9ee4a42813 (Cray: Fix Cray compiler detection on new platforms, 2020-12-01, v3.19.2~26^2) confuses detection of the CrayPrgEnv with identification of the Cray compiler. The change regressed detection of the CrayPrgEnv on non-Cray compilers. Revert it pending further investigation into the original problem. Fixes: #21894
* | | Merge topic 'ExternalData-windows'Brad King2021-03-081-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31be23dd1d ci: Restore the Module.ExternalData test on Windows fdfbf89f0c ExternalData: Avoid replacing a concurrently-created object Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5883
| * | | ExternalData: Avoid replacing a concurrently-created objectBrad King2021-03-051-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If more than one content link references the same object, the build system may launch multiple download processes for the same object concurrently. Use whichever one finishes first, and discard the others. Without this, we replace the objects and use the last finisher instead of the first. This is okay on non-Windows platforms where `rename(2)` gives reliable atomic replacement. However, on Windows platforms and NTFS this is less reliable. I've observed `MoveFileEx` somehow cause another process to get `ERROR_SHARING_VIOLATION` when attempting to read the destination file. We may be able to improve the `file(RENAME)` implementation on modern Windows 10 versions, but for ExternalData's use case it is simpler to just not replace existing objects.
* | | | Merge topic 'cray-fortran'Brad King2021-03-081-0/+4
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | ef513fe3d1 Cray: Enable explicit Fortran preprocessing for Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5882
| * | Cray: Enable explicit Fortran preprocessing for Ninja generatorBrad King2021-03-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Cray 11.0 adds support for preprocessing with output written to a specified file (instead of always next to the source). Use it to enable Cray Fortran with the Ninja generator. Patch-by: James Elliott Fixes: #20731
| * | Merge topic 'android-r22' into release-3.20Brad King2021-03-032-1/+40
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 005e2cdfb0 Android: Do not use gold for ndk >= r22 ed7a87f270 Tests: Update RunCMake.Android for NDK r22 4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable 746906242d Android: Detect NDK version number Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5862
* | \ \ Merge topic 'android-r22'Brad King2021-03-032-1/+40
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 005e2cdfb0 Android: Do not use gold for ndk >= r22 ed7a87f270 Tests: Update RunCMake.Android for NDK r22 4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable 746906242d Android: Detect NDK version number Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5862
| * | | Android: Do not use gold for ndk >= r22Haibo Huang2021-03-031-1/+1
| | | | | | | | | | | | | | | | Fixes: #21772
| * | | Android: Detect NDK version numberHaibo Huang2021-03-031-0/+39
| | | | | | | | | | | | | | | | Report it in `CMAKE_ANDROID_NDK_VERSION`.
* | | | Merge topic 'nasm_add_deps'Brad King2021-03-031-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48e74ec1e6 ASM_NASM: generate depfiles for other makefiles fcf16e9459 ASM_NASM: Add depfile generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5868
| * | | | ASM_NASM: generate depfiles for other makefilesFrancesco Bertolaccini2021-03-021-0/+7
| | | | |
| * | | | ASM_NASM: Add depfile generationFrancesco Bertolaccini2021-03-011-0/+2
| | | | |
* | | | | Merge topic 'compilerid_require_success'Brad King2021-03-031-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 1bd8f19453 CMakeDetermineCompilerId: Fix REQUIRE_SUCCESS with multiple user flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5874
| * | | | CMakeDetermineCompilerId: Fix REQUIRE_SUCCESS with multiple user flagsRaul Tambre2021-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | Need to quote the list expansion otherwise we'll try each argument separately.
| * | | | Merge topic 'FindOpenGL-GLX-no-GLVND' into release-3.20Brad King2021-03-021-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb4b2ed0d3 FindOpenGL: handle GLX without GLVND Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5861
* | \ \ \ \ Merge topic 'Tocic-master-patch-04743'Brad King2021-03-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 507710438d FindBoost: Fix typo in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5869
| * | | | | | FindBoost: Fix typo in documentationTocic2021-03-011-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'FindOpenGL-GLX-no-GLVND'Brad King2021-03-021-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | fb4b2ed0d3 FindOpenGL: handle GLX without GLVND Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5861
| * | | | | FindOpenGL: handle GLX without GLVNDBen Boeckel2021-02-261-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | On Ubuntu, installing `libgl-dev` provides `libGL` and `libGLX`, but no `libOpenGL`. Avoid defining GLVND targets without the `OpenGL::OpenGL` target.
* | | | | Merge topic 'FindDoxygen-policy-warnings'Brad King2021-03-011-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79fa7529e0 FindDoxygen: Prevent CMP0054 policy warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5864
| * | | | | FindDoxygen: Prevent CMP0054 policy warningsCraig Scott2021-02-281-0/+1
| | | | | | | | | | | | | | | | | | Fixes: #21871
* | | | | | Merge topic 'compilerid_require_success'Brad King2021-03-011-16/+34
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bdc40742bd CMakeDetermineCompilerId: Test without COMPILER_ID_FLAGS if REQUIRE_SUCCESS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5863
| * | | | | CMakeDetermineCompilerId: Test without COMPILER_ID_FLAGS if REQUIRE_SUCCESSRaul Tambre2021-02-271-16/+34
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | If we REQUIRE_SUCCESS, i.e. TEST_FLAGS_FIRST must work, we need to also try without user flags. Fixes #21869.
* | | | | Merge topic 'FindIntl-FindIconv-versions'Brad King2021-03-012-22/+139
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9b11a06f5 FindIntl: Add version support 01e9922db5 FindIconv: Add version support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5852
| * | | | FindIntl: Add version supportSibi Siddharthan2021-02-251-21/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional Changes: Rework the documentation of FindIntl NOTES: Reorder the REQUIRED_VARS arguments so find_package reports the library instead of the include directory. Handle Intl_LIBRARY in the same way how FindIconv handles it in case of glibc. If the VERSION_VAR argument is an empty string nothing happens. Fixes: #21857
| * | | | FindIconv: Add version supportSibi Siddharthan2021-02-251-1/+43
| | | | | | | | | | | | | | | | | | | | Issue: #21857
* | | | | Merge topic 'FetchContent-docs'Craig Scott2021-02-281-7/+12
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24b467c043 Help: Prefer commit hashes in FetchContent examples for security reasons ebcb8896e3 Help: Add missing MD5= for URL_HASH in FetchContent example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5834
| * | | | Help: Prefer commit hashes in FetchContent examples for security reasonsHarmen Stoppels2021-02-251-6/+11
| | | | | | | | | | | | | | | | | | | | Fixes: #21841 Co-Authored-By: Craig Scott <craig.scott@crascit.com>
| * | | | Help: Add missing MD5= for URL_HASH in FetchContent exampleCraig Scott2021-02-251-1/+1
| | | | | | | | | | | | | | | Fixes: #21859
* | | | | IntelLLVM: C17 supportRaul Tambre2021-02-251-3/+7
| | | | | | | | | | | | | | | | | | | | Issue: #17755
* | | | | GNU: C23 supportRaul Tambre2021-02-251-0/+5
| | | | | | | | | | | | | | | | | | | | Added in commit 9f936c861383dc69e0053e34315d5d0262a19e8f, released in 9.1.
* | | | | GNU: C17 supportRaul Tambre2021-02-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added in commit c76dc9c32d616eff1e0ae162042f1c0f8ca65fbf, released in 8.1. Set as default in the same commit. Issue: #17755
* | | | | Clang: Default C standard doesn't depend on compatibility modeRaul Tambre2021-02-251-5/+1
| | | | | | | | | | | | | | | | | | | | MSVC compatibility mode doesn't affect the default standard.
* | | | | Clang: Set standard flags according to frontend variantRaul Tambre2021-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They depend on the frontend not which compiler we're simulating. Fixes #21771.
* | | | | Clang: MSVC-style C flagsRaul Tambre2021-02-251-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Support added in LLVM commit d087d805acb664e885e9c31a916f6cfa5dbc2186, will be released in Clang 13.
* | | | | Clang: C23 supportRaul Tambre2021-02-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Added in LLVM commit d06f3917913d2558b771ccc48d838f8cd8993c01, released in Clang 9.0.
* | | | | Clang: C17 default versionRaul Tambre2021-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switched in LLVM commit 91cdbd521a38495c66e30636943563ca70d3c022, released in Clang 11. Issue: #17755
* | | | | Clang: C17 supportRaul Tambre2021-02-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added in LLVM commit 5b6c0f75e01571851b767dc63a3229c962f464f1, available since Clang 6. Issue: #17755
* | | | | C23 supportRaul Tambre2021-02-254-0/+12
| | | | |
* | | | | C17 supportRaul Tambre2021-02-254-0/+12
| | | | | | | | | | | | | | | | | | | | Implements #17755.