summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'host-distro-info'Brad King2021-08-242-0/+79
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9698f89df cmake_host_system_information: Make it available for all systems 5469c71a82 Refactor: Simplify `GetValue()` function calls 6c92f80f2e cmake_host_system_information: Also set `USED_FALLBACK_SCRIPT` efe139d1b8 cmake_host_system_information: Can run fallback scripts 1e65e4a6e5 cmake_host_system_information: Can read `/etc/os-release` file e808cbb1dd Testing: Convert `cmake_host_system_information` tests into `RunCMake` 9e831284e5 Documentation: Use definition list instead of tables 346f3de005 Refactor: Deduplicate code for `VS_nn_DIR` keys processing ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6410
| * cmake_host_system_information: Can run fallback scriptsAlex Turbov2021-08-202-0/+79
| |
* | Merge topic 'FindMPI-framework-not-a-compile-flag'Brad King2021-08-241-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | 2b2a6a7170 FindMPI: do not detect `-framework` as a compile flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com> Merge-request: !6467
| * | FindMPI: do not detect `-framework` as a compile flagBen Boeckel2021-08-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPICH 3.4.2 now reports `-framework OpenCL` as one of its compilation flag. The compile flag extraction is seeing it as a generic `-f` flag and misses its argument. This ends up with a compile option of `-framework` which eats the next flag (and may be very important). It does not seem that passing `-framework` as a link flag is necessary at this time, so that is being actively ignored for now. Fixes: #22555
| * | Merge topic 'FindPkgConfig-restore-legacy-behavior' into release-3.21Brad King2021-08-191-0/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 17e4934dbf FindPkgConfig: Restore legacy behavior when CMP0126 is set to NEW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6461
| * \ \ Merge topic 'binutils-clang-fallback-ld' into release-3.21Brad King2021-08-191-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 788b7afff2 FindBinUtils: Fall back to ld for Clang without lld Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6457
| * \ \ \ Merge topic 'CheckLanguage-CMP0126' into release-3.21Brad King2021-08-191-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89ed11ae6f CheckLanguage: Avoid CMP0126 warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6462
* | \ \ \ \ Merge topic 'FetchContent_doc_restructure'Craig Scott2021-08-241-200/+252
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e802193a34 Help: Rework docs to prioritize FetchContent_MakeAvailable() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6475
| * | | | | | Help: Rework docs to prioritize FetchContent_MakeAvailable()Craig Scott2021-08-231-200/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FetchContent_MakeAvailable() should be strongly preferred over the direct use of FetchContent_Populate(). The latter was the only method available before CMake 3.14, but the former is simpler and offers more functionality. Restructure the docs and improve the wording to steer the reader toward `FetchContent_MakeAvailable()` as the preferred approach. Also take the opportunity to pull out the variables that influence behavior into their own section. They were easily missed when buried in the docs for the FetchContent_Populate() command.
* | | | | | | Merge topic 'help_check'Brad King2021-08-193-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d62d0f048f Help: CheckFortranFunctionExists: recommend more general CheckSourceCompiles 8fddc2bb2f Help: refer to CheckSourceCompiles instead of older Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6446
| * | | | | | | Help: CheckFortranFunctionExists: recommend more general CheckSourceCompilesMichael Hirsch2021-08-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CheckFortranFunctionExists is really only relevant to Fortran 77 code. Fortran 90 and newer users should use CheckSourceCompiles instead.
| * | | | | | | Help: refer to CheckSourceCompiles instead of olderMichael Hirsch2021-08-112-2/+2
| |/ / / / / /
* | | | | | | Merge topic 'FindPkgConfig-restore-legacy-behavior'Brad King2021-08-191-0/+8
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17e4934dbf FindPkgConfig: Restore legacy behavior when CMP0126 is set to NEW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6461
| * | | | | | FindPkgConfig: Restore legacy behavior when CMP0126 is set to NEWMarc Chevrier2021-08-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Module behavior must be independent from `CMP0126` policy. Fixes: #22526
* | | | | | | Merge topic 'binutils-clang-fallback-ld'Brad King2021-08-191-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 788b7afff2 FindBinUtils: Fall back to ld for Clang without lld Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6457
| * | | | | | FindBinUtils: Fall back to ld for Clang without lldThomas Bernard2021-08-181-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `lld` is not available, Clang can still use `ld`. Fixes: #22500
* | | | | | Merge topic 'CheckLanguage-CMP0126'Brad King2021-08-191-0/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 89ed11ae6f CheckLanguage: Avoid CMP0126 warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6462
| * | | | | CheckLanguage: Avoid CMP0126 warningBrad King2021-08-181-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro's implementation converts a normal variable into a cache variable intentionally, so both are set. Explicitly set CMP0126 to NEW to avoid a warning in trace mode. This won't affect the module behavior because the code path does not activate if a normal variable is already defined anyway. Fixes: #22548
* | | | | Merge topic 'android-macos-arm64'Brad King2021-08-191-1/+1
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | | | | | 164643fc39 Android: Fix NDK toolchain dir on arm64 mac Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6449
| * | | Android: Fix NDK toolchain dir on arm64 macWangBin2021-08-181-1/+1
| |/ /
| * | Merge topic 'binutils-no-cmake-paths' into release-3.21Brad King2021-08-103-3/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | fc1f733cc7 BinUtils: Avoid searching CMAKE_PREFIX_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6434
| * \ \ Merge topic 'nvhpc_support_new_c_and_c++_standards' into release-3.21Brad King2021-08-092-0/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ac426e460 NVHPC-C: Add support for C17 f5dbc27c27 NVHPC-CXX: Add support for C++20 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !6430
* | \ \ \ Merge topic 'armclang-compiler-deps'Brad King2021-08-102-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ef5255e1e armclang: activate compiler dependencies generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6433
| * | | | | armclang: activate compiler dependencies generationMarc Chevrier2021-08-062-0/+16
| | | | | |
* | | | | | Merge topic 'GoogleTest-gtest-filter'Brad King2021-08-102-3/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea6a7dd1c2 GoogleTest: Add TEST_FILTER arg to gtest_discover_tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6406
| * | | | | | GoogleTest: Add TEST_FILTER arg to gtest_discover_testsAshish Sadanandan2021-08-052-3/+19
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `TEST_FILTER` argument can be used to filter tests during the discovery phase. It combines `--gtest_filter=<expr>` with the `--gtest_list_tests` argument when invoking the test excutable for listing defined tests. Fixes: #17493
* | | | | | Merge topic 'binutils-no-cmake-paths'Brad King2021-08-103-3/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | fc1f733cc7 BinUtils: Avoid searching CMAKE_PREFIX_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6434
| * | | | | BinUtils: Avoid searching CMAKE_PREFIX_PATHCristian Adam2021-08-093-3/+7
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our `find_program` calls specify `HINTS` to look in the toolchain's directory first, and then in `PATH`. `CMAKE_PREFIX_PATH` may be specified by the user to help find packages for project dependencies, but this should not override the binutils. Fixes: #22512
| * | | | Merge topic 'macos-10.4' into release-3.21Brad King2021-08-061-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1af23c4de2 macOS: Restore support for Mac OS X 10.4 (Tiger) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6426
* | \ \ \ \ Merge topic 'nvhpc_support_new_c_and_c++_standards'Brad King2021-08-092-0/+10
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ac426e460 NVHPC-C: Add support for C17 f5dbc27c27 NVHPC-CXX: Add support for C++20 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !6430
| * | | | | NVHPC-C: Add support for C17Robert Maynard2021-08-051-0/+5
| | | | | |
| * | | | | NVHPC-CXX: Add support for C++20Robert Maynard2021-08-051-0/+5
| |/ / / /
* | | | | Merge topic 'macos-10.4'Brad King2021-08-061-1/+3
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | 1af23c4de2 macOS: Restore support for Mac OS X 10.4 (Tiger) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6426
| * | | macOS: Restore support for Mac OS X 10.4 (Tiger)Evan Miller2021-08-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4aed96e230 (Apple: Set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG on non-macOS too, 2021-04-06, v3.20.1~5^2) we always enable support for linking with `-rpath`. The intention of the change was to enable using the flag on iOS, tvOS and watchOS by avoiding a Darwin-specific version check. However, removing the check broke support for OS X 10.4 because the flag is not supported on that version. Restore a form of the check that disables the flag on OS X < 10.5 while still allowing it for the other Apple platforms. Since no one is doing iOS/tvOS/etc development on 10.4, this change should have no unintended side effects. Fixes: #22490
| * | | Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20Brad King2021-07-091-3/+2
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !6328
| | * | | 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.
* | | | | Merge topic 'irsl-intel'Brad King2021-08-031-9/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4c194398d IRSL: Avoid duplication of Intel redist lib folder paths 2adc45c7f6 IRSL: Fix check of path to Intel redistdir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6414
| * | | | | IRSL: Avoid duplication of Intel redist lib folder pathsAlexander Grund2021-08-021-9/+24
| | | | | |
| * | | | | IRSL: Fix check of path to Intel redistdirAlexander Grund2021-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a cut-n-paste error from commit fd4406f33e (IRSL: Add Intel compiler support, 2017-08-16, v3.10.0-rc1~187^2). Make the checked and used paths match.
* | | | | | Merge topic 'nsis_ignore_license_page'Brad King2021-08-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 795e406e3b CPack/NSIS: Add option to not display license page Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6422
| * | | | | | CPack/NSIS: Add option to not display license pageJohnny Jazeix2021-08-011-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes: #22215
* | | | | | Merge topic 'FindX11-more-advanced-variables'Brad King2021-08-031-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 076d0a1710 FindX11: mark more xcb variables as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6424
| * | | | | | FindX11: mark more xcb variables as advancedBen Boeckel2021-08-021-0/+6
| |/ / / / /
* | | | | | Merge topic 'gate-vtk-compat'Brad King2021-08-031-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7391363302 VTKCompatibility: ignore for "modern" VTK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6413
| * | | | | | VTKCompatibility: ignore for "modern" VTKBen Boeckel2021-08-021-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Modern versions which use the module system really don't need any of the hacks needed here.
* | | | | | Merge topic 'cpack-rpm-pre-semicolon'Brad King2021-08-031-3/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3cdf23985f CPackRPM: avoid a spurious `;` in the `%pre` and other sections with scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6415
| * | | | | CPackRPM: avoid a spurious `;` in the `%pre` and other sections with scriptsArtur Samarin2021-08-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally added by commit 34c8a23044 (CPackRPM: add scriplets tags only if scripts exist, 2021-04-01, v3.21.0-rc1~387^2). Fixes: #22501
* | | | | | Merge topic 'find_cudatoolkit_understand_nvhpc_math_library_location'Brad King2021-08-021-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d856aaa37d FindCUDAToolkit: Understand NVHPC versioned math library layout Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6405
| * | | | | | FindCUDAToolkit: Understand NVHPC versioned math library layoutRobert Maynard2021-07-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NVHPC packages bundle the CUDA math libraries in a sibling directory (`math_libs`) instead of in with the rest of the cuda libraries. Depending on the NVHPC package the math_libs folder can have versioned subdirectories, therefore we prefer finding the same versions as the CUDA Toolkit and falling back to the latest when not possible.
* | | | | | | Merge topic 'nvhpc-MD-flag'Brad King2021-08-023-10/+12
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | | | | | | | | | | | | | | 7ce718376c NVHPC: Support 21.07 change to '-MD' where it behaves like gcc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6408