summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindwxWidgets-imported-target'Brad King2023-03-091-0/+21
|\ | | | | | | | | | | | | | | | | e36e455b7c FindwxWidgets: Add an imported target 42c84b1e2e ci: Add wxWidgets to Debian and Fedora base images Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8289
| * FindwxWidgets: Add an imported targetCheesyNacho102023-03-081-0/+21
| |
* | Modules:Check*: refactor: use block(SCOPE_FOR POLICIES)scivision2023-03-088-16/+17
|/
* Merge topic 'findmatlab'Brad King2023-03-082-84/+67
|\ | | | | | | | | | | | | | | | | | | | | 103dbb2fd2 FindMatlab: Windows -wait is only for -r, not -batch 1932ae0284 FindMatlab: refactor: use string(APPEND c4cacdc7eb FindMatlab: use modern foreach() af05544c49 FindMatlab: document function input/output 257a3e870e FindMatlab: add Matlab_VERSION and document. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8286
| * FindMatlab: Windows -wait is only for -r, not -batchscivision2023-03-071-2/+2
| |
| * FindMatlab: refactor: use string(APPENDscivision2023-03-071-8/+7
| |
| * FindMatlab: use modern foreach()scivision2023-03-071-32/+7
| | | | | | | | remove unused superseded commented code
| * FindMatlab: document function input/outputscivision2023-03-071-41/+42
| |
| * FindMatlab: add Matlab_VERSION and document.scivision2023-03-071-1/+9
| | | | | | | | fixes #24569
* | Merge topic 'vs-props-order'Brad King2023-03-081-0/+3
|\ \ | | | | | | | | | | | | | | | | | | d3c4c6d630 VS: Import default C++ props file before toolset-specific props file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8294
| * | VS: Import default C++ props file before toolset-specific props fileMatthew Voss2023-03-071-0/+3
| |/ | | | | | | | | | | | | This avoids overwriting toolset-specific settings like `VCRedistDir` with default settings. Fixes: #22420
* | FindCUDAToolkit: Add support for finding Tegra cudla libraryRobert Maynard2023-03-071-0/+19
|/ | | | Fixes #24575
* Merge topic 'clang-16-cxx-modules'Brad King2023-03-061-0/+14
|\ | | | | | | | | | | | | | | | | 3fe8e33f27 Clang: Record Clang 16.0 flags for our experimental C++ modules support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !8285
| * Clang: Record Clang 16.0 flags for our experimental C++ modules supportBrad King2023-03-031-0/+14
| | | | | | | | LLVM/Clang 16.0 now contains official support for what CMake needs.
| * Merge topic 'ExternalProject-revert-install' into release-3.26Brad King2023-03-031-5/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 771387523a ExternalProject: Restore driving install through build system Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !8279
* | \ Merge topic 'GoogleTest-type-param-suite'Brad King2023-03-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9aa9032266 GoogleTest: Restore suite name for type-parametrized tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8282
| * | | GoogleTest: Restore suite name for type-parametrized testsBrad King2023-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression from commit 073dd1bd81 (GoogleTest: Change format for typed tests, 2022-02-07, v3.23.0-rc1~4^2) in the suite name detection. Co-authored-by: Evgeniy Shcherbina <ixsci@pm.me> Fixes: #24563
* | | | Merge topic 'ExternalProject-revert-install'Brad King2023-03-031-5/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 771387523a ExternalProject: Restore driving install through build system Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !8279
| * | | ExternalProject: Restore driving install through build systemBrad King2023-03-021-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 66b5d51f38 (ExternalProject: Install CMake projects using 'cmake --install', 2022-09-08, v3.25.0-rc1~150^2). It changed the ExternalProject install step command from: cmake --build <dir> --target install --config <cfg> to: cmake --install <dir> --config <cfg> The latter command no longer runs the external project build system during the install step. We could consider using the commands: cmake --build <dir> --target all --config <cfg> cmake --install <dir> --config <cfg> as the install step, but if `CMAKE_SKIP_INSTALL_ALL_DEPENDENCY` is used in the external project, that can change semantics too. Revert the original change pending further investigation on other ways to support its motivating use case. Add a test covering the previously-regressed use case. Fixes: #24567 Issue: #23946
* | | | Merge topic 'retry-file-download-on-timeout'Brad King2023-03-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 296d2bef06 ExternalProject: Also retry curl download on timeout error Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !8270
| * | | | ExternalProject: Also retry curl download on timeout errorGreg Thain2023-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f24e34975a (ExternalProject: retry download on recoverable errors, 2020-08-08, v3.19.0-rc1~298^2~1) ExternalProject has a list of curl errors which trigger a retry today: 6, 7, 8 and 15. Add curl error 28. It is a "timeout error", and should also trigger a retry attempt at a download of an external project. The complete list of curl errors is https://curl.se/libcurl/c/libcurl-errors.html
* | | | | Merge topic 'Apple-handle-Text-Stubs'Brad King2023-03-029-1/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ede33f30cf Apple: Handle generation and comsuption of text-based stubs (.tbd files) fcbd723a50 Enhance support functions Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !8204
| * | | | | Apple: Handle generation and comsuption of text-based stubs (.tbd files)Marc Chevrier2023-03-019-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #24123
* | | | | | Merge topic 'FindPython-fix-CMAKE_SHARED_LIBRARY_SUFFIX-matching'Brad King2023-03-011-3/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 764441e672 FindPython: fix erroneous ${CMAKE_SHARED_LIBRARY_SUFFIX} matching Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8271
| * | | | | FindPython: fix erroneous ${CMAKE_SHARED_LIBRARY_SUFFIX} matchingMarc Chevrier2023-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #24556
* | | | | | Merge topic 'FindVulkan-mingw-cross-compiling'Brad King2023-03-011-7/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 829f1b5be4 FindVulkan: Add more search paths for MINGW when cross compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8256
| * | | | | | FindVulkan: Add more search paths for MINGW when cross compilingRalf Habacker2023-02-281-7/+10
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes: #24536
* | | | | | Dart,FindDart: Add policy to remove these modulesBrad King2023-02-282-0/+27
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | These modules and the "DART" tool they support have long been replaced by CTest.
* | | | | FindX11: support the xcb-{cursor,shape,xrm} componentsBen Boeckel2023-02-271-0/+51
|/ / / / | | | | | | | | | | | | Fixes: #24417
* | | | Merge topic 'fetchcontent-reject-CMAKE_TOOLCHAIN_FILE-env-var'Craig Scott2023-02-252-7/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c15674a9cb FetchContent: Reject CMAKE_TOOLCHAIN_FILE env var in sub-build 31ef93f19f FetchContent: Only use @-@ replacements for sub-build CMakeLists.txt Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8248
| * | | | FetchContent: Reject CMAKE_TOOLCHAIN_FILE env var in sub-buildCraig Scott2023-02-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sub-build should never try to use a toolchain file. The toolchain file may itself be getting downloaded by FetchContent. If the CMAKE_TOOLCHAIN_FILE environment variable is set, CMake uses it to initialize the CMake variable of the same name. We need to explicitly clear them before the first project call of the sub-build. Fixes: #24535
| * | | | FetchContent: Only use @-@ replacements for sub-build CMakeLists.txtCraig Scott2023-02-242-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a mix of ${} and @-@ substitutions in the CMakeLists.txt.in file. It is sometimes useful to temporarily put ${} evaluations there while working on issues, but they get replaced. Using @ONLY leaves them untouched and uses a consistent substitution method for the whole file.
* | | | | Merge topic 'FetchContent-generator-instance'Brad King2023-02-241-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9af0e67ee5 FetchContent: Relay CMAKE_GENERATOR_INSTANCE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8195
| * | | | | FetchContent: Relay CMAKE_GENERATOR_INSTANCEMáté Ferenc Nagy-Egri2023-02-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If set, relay `CMAKE_GENERATOR_INSTANCE`. It may affect compiler detection in the subbuild folder. Fixes: #24404
* | | | | | Merge topic 'GenerateExportHeader-Fix-Clang-support-on-Windows'Brad King2023-02-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e19936320 GenerateExportHeader: Fix Clang support on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Adrien De Coninck <deconinck.adrien@gmail.com> Merge-request: !8221
| * | | | | | GenerateExportHeader: Fix Clang support on WindowsCorentin Damman2023-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using Clang with Visual Studio, the GenerateExportHeader function generates the DEPRECATED definition "__attribute__ ((__deprecated__))", because Clang can compile such instruction. However, if a user wants to compile the library with this generated header with MSVC, the declaration is not valid. We suggest to always use the DEPRECATED definition "__declspec(deprecated)" on Windows, which is valid for both Clang and MSVC.
* | | | | | | Merge topic 'find-openssl-find-pthread'Brad King2023-02-241-1/+14
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | 24c7279a6f FindOpenSSL: Search for -pthread flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8246
| * | | | | FindOpenSSL: Search for -pthread flagKyle Edwards2023-02-231-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because -pthread doesn't begin with -l, it doesn't show up in the pkgconfig LIBRARIES variable, causing FindOpenSSL to not add the Threads::Threads dependency. Explicitly search LDFLAGS_EXTRA for -pthread and add the dependency if it's found. Fixes: #24532
| * | | | | Merge topic 'BundleUtilities-chmod-later' into release-3.26Brad King2023-02-211-4/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1430f7f574 BundleUtilities: Avoid unnecessary chmod in fixup_bundle_item Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !8232
* | \ \ \ \ \ Merge topic 'iar-lang-vars'Brad King2023-02-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b365c461f IAR: Tolerate variables named for languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8235
| * | | | | | | IAR: Tolerate variables named for languagesJoakim Lönnberg2023-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a project or user sets a variable or cache entry named `C` or `CXX`, we were previously comparing those language names to the value of that variable, rather than the name itself. Double-quote the string to take advantage of policy `CMP0054`, but also add "x" prefixes to support projects that do not set the policy. This extends a similar fix from commit c8eb357738 (CompilerId: Tolerate variables named for languages, 2021-06-17, v3.21.0-rc1~9^2).
* | | | | | | | FindHDF5: Fix detection of Parallel HDF5Weiqun Zhang2023-02-211-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To detect Parallel HDF5, the output of `h5pcc -showconfig` was compared with `Parallel HDF5: yes`. However, the Boolean flag is not always `yes` or `no`, because it was set by the value in `HDF5_ENABLE_PARALLEL` if CMake was used for the configuration. This commit instead checks to see if the value is interpreted by CMake as "true".
* | | | | | | | Merge topic 'GetPrerequisites-linux-x86'Brad King2023-02-211-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf2ad9995a GetPrerequisites: Ignore relative paths printed by ldd Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8229
| * | | | | | | | GetPrerequisites: Ignore relative paths printed by lddĐoàn Trần Công Danh2023-02-201-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On x86 Linux, the ldd output for its vDSO (linux-gate.so.1) is a bit different from other Linux with standard vDSO name (linux-vdso.so.1). $ ldd /bin/ls linux-gate.so.1 => linux-gate.so.1 (0xf7f5e000) libcap.so.2 => /usr/lib32/libcap.so.2 (0xf7f22000) libc.so.6 => /usr/lib32/libc.so.6 (0xf7cfb000) /lib/ld-linux.so.2 => /usr/lib32/ld-linux.so.2 (0xf7f60000) This fixes the `Tests/BundleUtilities` test on x86 Linux.
* | | | | | | | Merge topic 'FindEXPAT-multi-config'Brad King2023-02-211-22/+78
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13079f382b FindEXPAT: Fix for debug and other modified builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8225
| * | | | | | | | FindEXPAT: Fix for debug and other modified buildstobil4sk2023-02-201-22/+78
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now considers debug builds, and various other build types which result in a modified library name by the upstream build system. Fixes: #24422
* | | | | | | | Merge topic 'BundleUtilities-chmod-later'Brad King2023-02-211-4/+3
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1430f7f574 BundleUtilities: Avoid unnecessary chmod in fixup_bundle_item Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !8232
| * | | | | | | BundleUtilities: Avoid unnecessary chmod in fixup_bundle_itemBrad King2023-02-201-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the permissions modification added by commit 88fed668b1 (Make bundle items writable before fixup, 2010-09-07, v2.8.3~129^2) inside the condition added by commit 45ed314bff (BundleUtilities: do not run install_name_tool on scripts, 2020-07-27, v3.19.0-rc1~404^2). There is no reason to add write permissions to a file that we are not going to modify. Fixes: #24424
* | | | | | | | Merge topic 'FindOpenSSL-threads'Brad King2023-02-211-6/+14
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8cedb1572 FindOpenSSL: Fix regression in dependency on threads Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Bret Brown <mail@bretbrownjr.com> Acked-by: Matias Lopez <imatlopez@gmail.com> Merge-request: !8230
| * | | | | | FindOpenSSL: Fix regression in dependency on threadsBrad King2023-02-201-6/+14
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 1b7804edd0 (FindOpenSSL: use extra dependencies from pkg-config as well, 2022-12-05, v3.26.0-rc1~227^2) we conditionally find Threads but unconditionally depend on it. Make the conditions consistent. Fixes: #24505