summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'android-PATH'Brad King2021-09-171-5/+0
|\ | | | | | | | | | | | | 94f3776774 Android: Restore searching PATH for executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6528
| * Android: Restore searching PATH for executableshhb2021-09-161-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Since commit a7f41a7ee4 (Android: Fix find_* search order within NDK for unified toolchains, 2020-10-13, v3.20.0-rc1~610^2), we turn off `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH`. This breaks `find_program` searching `PATH` for host executables. Fortunately, the setting turns out not to be necessary, perhaps since commit cbc51a8be3 (Android: restructure android search paths, 2020-11-06, v3.20.0-rc1~509^2). Without it, none of NDK tests fail, so remove it to restore pre-3.20 behavior. Fixes: #22634
| * Merge branch 'GNUInstallDirs-variable-named-0' into release-3.20Brad King2021-08-241-1/+1
| |\ | | | | | | | | | Merge-request: !6474
* | \ Merge topic 'iar-enable-in-list-operator'Brad King2021-09-171-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f77ffbc0e3 IAR: Restore support for projects not enabling policy CMP0057 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6527
| * | | IAR: Restore support for projects not enabling policy CMP0057Jean-Marc Hengen2021-09-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 5b9bfe738c (IAR: Moved search logic to BinUtils., 2021-07-19, v3.21.1~14^2), we use the `IN_LIST` operator in the `CMakeFindBinUtils` module. Set policy `CMP0057` to ensure it is available regardless of the project's policy settings. Fixes: #22640
| * | | Merge topic 'FindPyhton-homebew-on-Mac-M1' into release-3.21Marc Chevrier2021-09-071-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2636ad5045 FindPython: Ensure homebrew on Mac M1 is used Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6499
| * \ \ \ Merge topic 'vs2022' into release-3.21Brad King2021-09-032-3/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38c8f2c4e3 IRSL: Add discovery of VS 2022 v143 toolset redistributables f01ea7e391 MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6497
* | \ \ \ \ Merge topic 'cpack-nsis-apps-n-features'Brad King2021-09-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb3b3bacdc CPack/NSIS: Fix uninstall on Windows using "Apps & Features" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6517
| * | | | | | CPack/NSIS: Fix uninstall on Windows using "Apps & Features"Andras Lasso2021-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to NSIS documentation [1], uninstaller executable path in UninstallString must always be quoted. Quote the uninstall executable in `NSIS.template.in` so that it works when the path has spaces. [1] https://nsis.sourceforge.io/Add_uninstall_information_to_Add/Remove_Programs
* | | | | | | FindFLTK: Safe to include multiple timesRobert Maynard2021-09-141-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindFLTK could store multiple entries in `FLTK_INCLUDE_DIR`, and when re-executed would stored into `FLTK_DIR` which had uses which presumed single entries. Fixes #13198
* | | | | | | Merge topic 'find-matlab-imported-targets'Brad King2021-09-141-0/+53
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 161990b921 FindMatlab: Add imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6488
| * | | | | | | FindMatlab: Add imported targetsSilvio Traversaro2021-09-131-0/+53
| | | | | | | |
* | | | | | | | Merge topic 'GNUInstallDirs_become_conda_install_aware'Brad King2021-09-141-5/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ecaca8c129 GNUInstallDirs now aware of conda lib directory requirements Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Silvio Traversaro <pegua1@gmail.com> Merge-request: !6512
| * | | | | | | | GNUInstallDirs now aware of conda lib directory requirementsRobert Maynard2021-09-131-5/+32
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No matter the OS when installing for conda the library components need to be placed into the `lib` directory. To better meet these requirements GNUInstallDirs now checks to see if it is being asked to install into a conda install location, and if so use the 'lib' directory instead of the system directory name.
* | | | | | | | Merge topic 'iwyu-cl'Brad King2021-09-148-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ccfe1b0b40 IWYU: Add `--driver-mode=cl` when applicable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6511
| * | | | | | | | IWYU: Add `--driver-mode=cl` when applicablePigeonF2021-09-108-0/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already do this for `clang-tidy`. Fixes: #16554
* | | | | | | | Merge topic 'CMakeDependentOption-condition-syntax'Brad King2021-09-141-19/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 059b90a0b4 CMakeDependentOption: Introduce policy CMP0127 for full Condition Syntax Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6493
| * | | | | | | | CMakeDependentOption: Introduce policy CMP0127 for full Condition SyntaxDaniel Schürmann2021-09-101-19/+42
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22303
* | | | | | | | Merge topic 'CMakeFindPackageMode-sysroot'Brad King2021-09-141-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8defe3380e CMakeFindPackageMode: Honor CMAKE_SYSROOT to detect lib64 platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6513
| * | | | | | | CMakeFindPackageMode: Honor CMAKE_SYSROOT to detect lib64 platformsPablo Romero2021-09-091-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `CMAKE_SYSROOT` to check the full path on host OS. In a non-crosscompiling use case, the call to `CMAKE_SYSROOT` is empty. Fixes: #22608
* | | | | | | Merge topic 'icu-advanced'Brad King2021-09-101-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdd2714dfa FindICU: Really mark variables as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6507
| * | | | | | | FindICU: Really mark variables as advancedMathieu Malaterre2021-09-061-2/+2
| | | | | | | |
* | | | | | | | Merge topic 'clang_msvc_frontend_detection_for_asm'Brad King2021-09-101-1/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9c79dde41 Clang: Add MSVC frontend detection for the ASM compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6481
| * | | | | | | | Clang: Add MSVC frontend detection for the ASM compilerThomas Bernard2021-09-091-1/+18
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #22495
* | | | | | | | Merge topic 'thread-typos'Marc Chevrier2021-09-101-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d897391782 Fix typo in comment Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Arcturus <arcturus102@outlook.com> Merge-request: !6504
| * | | | | | | Fix typo in commentMattias Ellert2021-09-061-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment lists -lpthread twice, when "-lpthreads, -lpthread" is meant. Also the grammar (did not found) is incorrect.
* | | | | | | Merge topic 'FindPyhton-homebew-on-Mac-M1'Marc Chevrier2021-09-071-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | 2636ad5045 FindPython: Ensure homebrew on Mac M1 is used Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6499
| * | | | | FindPython: Ensure homebrew on Mac M1 is usedMarc Chevrier2021-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22581
* | | | | | Merge topic 'vs2022'Brad King2021-09-032-3/+10
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38c8f2c4e3 IRSL: Add discovery of VS 2022 v143 toolset redistributables f01ea7e391 MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6497
| * | | | | IRSL: Add discovery of VS 2022 v143 toolset redistributablesBrad King2021-09-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22586
| * | | | | MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolsetBrad King2021-09-021-1/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was forgotten in commit 0c7f918fb1 (VS: Update Visual Studio 17 2022 generator for Preview 2, 2021-07-14, v3.21.1~29^2) when the toolset was first renumbered to `v143`. Fixes: #22585
* | | | | Merge topic 'FindBoost-1.77'Brad King2021-09-031-3/+18
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 1ad0c5ae53 FindBoost: Add support for Boost 1.77 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6494
| * | | | FindBoost: Add support for Boost 1.77Brad King2021-09-021-3/+18
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the list of known versions. Run the command cmake -DBOOST_DIR=/path/to/boost_1_77_0 \ -P Utilities/Scripts/BoostScanDeps.cmake to extract dependencies from the 1.77.0 source tree. The dependencies differ from those of 1.76: the `contract`, `thread`, and `wave` components no longer depend on `date_time`. The `math` component no longer depends on `atomic`. Fixes: #22588
| * | | Merge topic 'GNUInstallDirs-variable-named-0' into release-3.21Brad King2021-08-251-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | 49a5dbcaff GNUInstallDirs: avoid unwanted variable dereference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6474
* | | | Merge topic 'darwin-wmake-jwasm-support'Brad King2021-08-251-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf09145eb0 Enable Watcom WMake generator on Darwin 78f758a463 Use dashes for MASM flags Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6472
| * | | | Use dashes for MASM flagsBradley Bell2021-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Microsoft's tools traditionally uses slashes, but accept dashes as well. If we use dashes, it becomes possible to use an alternative MASM-compatible assembler such as JWasm.
* | | | | Merge topic 'GNUInstallDirs-variable-named-0'Brad King2021-08-251-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 49a5dbcaff GNUInstallDirs: avoid unwanted variable dereference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6474
| * | | | GNUInstallDirs: avoid unwanted variable dereferenceBen Boeckel2021-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some situations, it seems that the variable `0` is defined. In the case found, it was set to `1`. This makes the detection of the missing third argument bogus and unnecessarily triggers a warning. This oversight was introduced in 229b5ee994 (GNUInstallDirs: Add dir argument to GNUInstallDirs_get_absolute_install_dir, 2020-10-31) prior to CMake 3.20's release cycle.
* | | | | 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
| |/ / / / / / / /