summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindGLUT: Move mark_as_advanced calls closer to find callsBrad King2021-12-201-3/+4
|
* 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
| | | |
* | | | Merge topic 'FindBoost-1.78'Brad King2021-12-161-2/+17
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | d176ff71c0 FindBoost: Add support for Boost 1.78 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6804
| * | FindBoost: Add support for Boost 1.78Brad King2021-12-151-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the list of known versions. Run the command cmake -DBOOST_DIR=/path/to/boost_1_78_0 \ -P Utilities/Scripts/BoostScanDeps.cmake to extract dependencies from the 1.78.0 source tree. The dependencies differ from those of 1.77: * The `log` component no longer depends on `date_time`. Fixes: #23016
* | | Merge topic 'android-system-stl'Brad King2021-12-141-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 38b00f8801 Android: Fix linking android_support for pre-21 system STL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6799
| * | Android: Fix linking android_support for pre-21 system STLRyan Prichard2021-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | This typo was introduced in commit 4dca078829 (Android: Link c++abi and android_support when necessary, 2020-10-29, v3.20.0-rc1~541^2). Fixes: #23004
* | | FindBLAS: Find OpenMP dependency quietlyBrad King2021-12-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `find_package(OpenMP)` calls added/updated by: * commit f7f3d8987a (FindBLAS: Add dependency of OpenBLAS on OpenMP for BLA_STATIC, 2020-11-10, v3.20.0-rc1~492^2) * commit 9ef82d95d8 (FindBLAS: Fix detection of OpenMP as dependency of BLA_STATIC, 2021-04-07, v3.20.1~3^2) were missing the `QUIET` option. Fixes: #23000
* | | Merge topic 'python3.11-support'Brad King2021-12-083-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 43844c5d82 FindPython: Add support for Python 3.11 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !6792
| * | FindPython: Add support for Python 3.11Tomáš Hrnčiar2021-12-073-3/+3
| | |
* | | Merge topic 'lib-arch-no-usr'Brad King2021-12-071-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | d4ba945c48 CMakeParseLibraryArchitecture: Fix parsing /lib/<arch> implicit object path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6790
| * | CMakeParseLibraryArchitecture: Fix parsing /lib/<arch> implicit object pathRaphael Gozzo2021-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current regular expression is able to match `/usr/lib/<arch>`, `/usr/usr/lib/<arch>`, `/usr/usr/usr/lib/<arch>`, ... but not `/lib/<arch>`. This behavior ends up causing the detected architecture to be x86_64-pc-linux-gnu when the Clang compiler is installed on a "non-system" location (like /opt/llvm-13) which, in turn, makes almost every 'find_library()' fail because the correct architecture is x86_64-linux-gnu. This is due to a typo in commit 764606e256 (CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths, 2021-04-05, v3.20.1~10^2), which used `+` instead of `?`.
* | | Merge topic 'FindOpenSSL-applink'Brad King2021-12-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 586d483983 FindOpenSSL: Fix typo in applink condition Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6787
| * | | FindOpenSSL: Fix typo in applink conditionBrad King2021-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 7b83ca816a (FindOpenSSL: add target OpenSSL::applink to support OpenSSL's applink feature, 2020-05-12, v3.18.0-rc1~150^2) the version check was written as "major.major.fix" instead of "major.minor.fix".
* | | | FindOpenSSL: Search in lib64 directories on non-Windows platformsBrad King2021-12-061-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | The upstream `openssl` build system may install libraries to `lib64` even on platforms whose conventions do not use `lib64` for distro-packaged libraries. Fixes: #22945
* | | Merge topic 'FindPkgConfig-pkgconf'Brad King2021-12-031-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 90a49647e9 FindPkgConfig: Restore finding pkg-config before pkgconf Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6780
| * | FindPkgConfig: Restore finding pkg-config before pkgconfBrad King2021-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 94a84dc0af (FindPkgConfig: add pkgconf to the search list., 2021-07-02, v3.22.0-rc1~468^2), `pkgconf` is preferred over `pkg-config` if they appear in the same directory. In some environments, `pkg-config` may be a wrapper that adds semantics beyond either `pkgconf` or the normal `pkg-config`. Prefer `pkg-config` over `pkgconf` in order to preserve the prior behavior in such environments. Fixes: #22976
* | | Merge topic 'FindPython-static-libs-hint'Brad King2021-12-023-0/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | a35bf772de FindPython: clarify static libraries hint usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6772
| * | FindPython: clarify static libraries hint usageMarc Chevrier2021-12-013-0/+15
| | | | | | | | | | | | Fixes: #22956
| * | Merge topic 'GNUInstallDirs-conda-fix' into release-3.22Brad King2021-12-011-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 7896991af0 GNUInstallDirs: Prefer system lib64 over conda lib when ambiguous Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6773
| * \ \ Merge topic 'doc-CMAKE_INSTALL_MODE' into release-3.22Brad King2021-11-301-0/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3caeee0c86 Help: Clarify CMAKE_INSTALL_MODE documentation 699d4a98e2 Help: Use definition list for allowed values of CMAKE_INSTALL_MODE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6743
* | \ \ \ Merge topic 'GNUInstallDirs-freebsd-mandir'Brad King2021-12-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c07bba2730 GNUInstallDirs: Update CMAKE_INSTALL_MANDIR for FreeBSD Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6722
| * | | | | GNUInstallDirs: Update CMAKE_INSTALL_MANDIR for FreeBSDDmitry Marakasov2021-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FreeBSD has switched from PREFIX/man ro PREFIX/share/man see https://cgit.freebsd.org/ports/tree/CHANGES entry 20200115. Fixes: #22883
* | | | | | Merge topic 'GNUInstallDirs-conda-fix'Brad King2021-12-011-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | 7896991af0 GNUInstallDirs: Prefer system lib64 over conda lib when ambiguous Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6773
| * | | | GNUInstallDirs: Prefer system lib64 over conda lib when ambiguousRobert Maynard2021-11-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update logic added by commit ecaca8c129 (GNUInstallDirs now aware of conda lib directory requirements, 2021-09-08, v3.22.0-rc1~142^2). When it is ambiguous if we are doing a conda install or a system install prefer using the system library directory. Fixes: #22962
* | | | | Merge topic 'doc-CMAKE_INSTALL_MODE'Brad King2021-11-301-0/+16
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 3caeee0c86 Help: Clarify CMAKE_INSTALL_MODE documentation 699d4a98e2 Help: Use definition list for allowed values of CMAKE_INSTALL_MODE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6743
| * | | | Help: Clarify CMAKE_INSTALL_MODE documentationFelix Lelchuk2021-11-231-0/+16
| | | | | | | | | | | | | | | | | | | | Fixes: #22869 Co-Authored-By: Craig Scott <craig.scott@crascit.com>
* | | | | Merge topic 'compiler-id-classic-c'Brad King2021-11-293-3/+3
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 0fc8b2f61c CompilerId: Restore support for classic C by avoiding C++ style comments Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6759
| * | | | CompilerId: Restore support for classic C by avoiding C++ style commentsBrad King2021-11-233-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++ style comments were added by commit fc3a1cbdd8 (CompilerID: Compiler extensions default detection, 2021-05-29, v3.22.0-rc1~52^2~2), but they may not be supported by the default mode of some C compilers. Use C-style comments instead. For consistency, do this for all languages. Fixes: #22942
| * | | Merge branch 'UseSWIG-create-workingdir' into release-3.22Brad King2021-11-221-1/+1
| |\ \ \ | | |/ / | |/| / | | |/ Merge-request: !6750
| * | Merge topic 'gtest_discover_tests-PRE_TEST-dep' into release-3.22Brad King2021-11-171-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bf6d5979d gtest_discover_tests: Re-run PRE_TEST discovery on any arg change 715af43124 Tests: Fix and update wrongly named GoogleTest stdout file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6728
* | \ \ Merge topic 'FindGTest-target-for-gmock'Brad King2021-11-221-1/+55
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50bf457a0d FindGTest: Add target for gmock library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6632
| * | | | FindGTest: Add target for gmock libraryEero Aaltonen2021-11-221-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `googlemock` has been absorbed into the [googletest](https://github.com/google/googletest) project and is built and installed from the same source tree. As GTest may be built with or without GMock, skip GMock if it is not present. Do not provide result variables for GMock. They are not provided by upstream GTest's CMake Package Configuration File. Also update the test case to cover linking to `GTest::gmock`.
* | | | | Merge topic 'GNUInstallDirs-multiarch-prefixes'Brad King2021-11-221-3/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd9584b352 GNUInstallDirs: Apply Debian multiarch LIBDIR to more prefixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6748
| * | | | | GNUInstallDirs: Apply Debian multiarch LIBDIR to more prefixesMathieu Malaterre2021-11-191-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On typical Debian amd64 system (bullseye), multiarch is setup as: ``` % cat /etc/ld.so.conf.d/x86_64-linux-gnu.conf /usr/local/lib/x86_64-linux-gnu /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu ``` Where: ``` % apt-cache policy libc6:amd64 libc6: Installed: 2.31-13+deb11u2 Candidate: 2.31-13+deb11u2 Version table: *** 2.31-13+deb11u2 500 500 http://deb.debian.org/debian bullseye/main amd64 Packages 100 /var/lib/dpkg/status ``` Update GNUInstallDirs to support all three cases `/`, `/usr/` and `/usr/local/`. Fixes: #19698
* | | | | | Merge topic 'cudatoolkit_update_cusparse_deps'Brad King2021-11-221-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fedca357d2 FindCUDAToolkit: Correct cusparse dependencies for 10.1, 11.2.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6745
| * | | | | | FindCUDAToolkit: Correct cusparse dependencies for 10.1, 11.2.2Robert Maynard2021-11-191-0/+17
| | | | | | |
* | | | | | | Merge topic 'UseSWIG-create-workingdir'Brad King2021-11-221-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 7224eb5185 UseSWIG: ensure directory for depfile exists Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6750
generated by cgit v0.12 at 2025-01-25 01:36:31 (GMT)