summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Apple: Handle generation and comsuption of text-based stubs (.tbd files)Marc Chevrier2023-03-019-1/+28
| | | | Fixes: #24123
* 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
* | | | Merge topic 'ci-linkcheck'Brad King2023-02-173-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0787148785 gitlab-ci: Report sphinx logs as artifacts of its lint job 14506f49a2 Utilities/Sphinx: Configure linkcheck allowed permanent redirects 3c5b34af9d Help: Replace links with their permanent redirects 1004be159f FindCUDAToolkit: Replace broken links to NVIDIA documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8210
| * | | | Help: Replace links with their permanent redirectsBrad King2023-02-173-3/+3
| | | | |
| * | | | FindCUDAToolkit: Replace broken links to NVIDIA documentationBrad King2023-02-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cuFile API documentation has moved, so link to its new location. The nvGRAPH library has been removed, so link to a web archive copy. The NTVX library has a higher-level landing page.
* | | | | Merge topic 'swift-debug-info'Brad King2023-02-172-2/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 9693191582 Swift: Emit debug information on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8090
| * | | | Swift: Emit debug information on WindowsSaleem Abdulrasool2023-02-162-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building on Windows, pass `-debug` to the linker to emit the PDB (or `-debug:dwarf` when building with lld and using DWARF). We would previously not do this which meant that we never emitted the debug information making debugging more difficult. Fixes: #24423
* | | | LCC: Disable Fortran preprocessor testing if unsupportedmakise-homura2023-02-162-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | LCC < 1.24 has no way to disable integrated Fortran preprocessor, and it can't produce preprocessed files explicitly. So we disable all functionality (and therefore tests) related to it.
* | | | LCC: Don't require liblfortran on lcc versions that don't have itmakise-homura2023-02-151-3/+3
|/ / / | | | | | | | | | | | | There wasn't a liblfortran library before 1.24 (actually 1.24.01), and it is replaced by libgfortran in 1.26.03 and later.
* | | Merge topic 'LLVMFlang-post-preprocessed'Brad King2023-02-151-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 3f1e58c5b9 LLVMFlang: Fix post-preprocess compile for fixed-form Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Andrzej Warzyński <andrzej.warzynski@gmail.com> Merge-request: !8205
| * | LLVMFlang: Fix post-preprocess compile for fixed-form FortranDavid Truby2023-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LLVM Flang's preprocessor output is always valid fixed form Fortran with a fixed line length of 72. If an application tries to use fixed form with a different line length, this will fail in the post-preprocessing compilation step as they will pass a flag asking for a different fixed line length. To fix this we can pass -ffixed-line-length-72 to the post-preprocess compilation stage. This will be ignored when the input is free form Fortran, and force to a 72 line length when the input is fixed.
* | | Merge topic 'lcc-major-version'Brad King2023-02-142-8/+4
|\ \ \ | |/ / | | / | |/ |/| | | | | 2a75edb342 LCC: Fix extraction of __LCC__ version components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8199
| * LCC: Fix extraction of __LCC__ version componentsBrad King2023-02-132-8/+4
| | | | | | | | | | Previously the logic only worked for major versions of the form `1.xx`. Fix it to work with versions `2.xx` and above.
| * Merge topic 'findopenssl-static-findpkg-fix' into release-3.26Brad King2023-02-081-2/+8
| |\ | | | | | | | | | | | | | | | | | | | | | 652f34eab9 FindOpenSSL: Use static pkgconfig if OPENSSL_USE_STATIC_LIBS=ON Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8174
* | \ Merge topic 'findopenssl-static-findpkg-fix'Brad King2023-02-081-2/+8
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 652f34eab9 FindOpenSSL: Use static pkgconfig if OPENSSL_USE_STATIC_LIBS=ON Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8174
| * | FindOpenSSL: Use static pkgconfig if OPENSSL_USE_STATIC_LIBS=ONKyle Edwards2023-02-071-2/+8
| | | | | | | | | | | | Fixes: #24395
* | | Merge topic 'doc-FetchContent-catch2'Brad King2023-02-081-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 6d48f48d5d FetchContent: Bump documented example Catch2 to v3.0.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8172
| * | FetchContent: Bump documented example Catch2 to v3.0.1Eisuke Kawashima2023-02-071-3/+3
| |/ | | | | | | | | | | The previous Catch2 v2.13.4 does not compile on some platforms [1]. [1] https://github.com/catchorg/Catch2/issues/2326
| * Merge topic 'android-ndk-legacy-toolchain' into release-3.26Brad King2023-02-072-1/+3
| |\ | | | | | | | | | | | | | | | | | | cb0b9452e8 Android: Provide CMAKE_ANDROID_NDK_VERSION with NDK legacy toolchain file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8170
| * \ Merge topic 'FindCUDAToolkit-nvrtc-builtins' into release-3.26Brad King2023-02-071-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 9688a8ebc2 FindCUDAToolkit: Fix `nvrtc_builtins_static` library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8162
* | \ \ Merge topic 'avoid-cmake-cfg-intdir'Brad King2023-02-072-8/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b17b6da6a cmGlobalGenerator: Avoid referencing CMAKE_CFG_INTDIR f34876561f Tests: Remove or silence instances of ${CMAKE_CFG_INTDIR} 78cf427157 RULE_LAUNCH_*: Add support for generator expressions cabad8a37f ExternalProject: Always use $<CONFIG> for source files 62e8884d3f CTestTargets: Use $<CONFIG> instead of ${CMAKE_CFG_INTDIR} Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8169
| * | | | ExternalProject: Always use $<CONFIG> for source filesKyle Edwards2023-02-031-7/+1
| | | | |
| * | | | CTestTargets: Use $<CONFIG> instead of ${CMAKE_CFG_INTDIR}Kyle Edwards2023-02-031-1/+1
| | | | |
* | | | | Merge topic 'KateImprovements'Brad King2023-02-071-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7f7bff4f5 Kate: improve the way the VCS-specific files are searched 96389b4cd3 Kate: add support for hg and fossil 4c32623f5f Help: fix typo in docs for set_property() 9a7612d2d0 Kate: make it possible to force a mode for the "files" entry 8a7aa2642b Help: add documentation for Kate-related variable Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8154
| * | | | | Kate: make it possible to force a mode for the "files" entryAlexander Neundorf2023-02-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, kate will try to autodetect whether the project is a svn or git checkout or not. In case this does not give a satisfying result, the user can now set CMAKE_KATE_FILES_MODE to the mode he wants.
| * | | | | Help: add documentation for Kate-related variableAlexander Neundorf2023-02-031-2/+2
| |/ / / /
* | | | | Merge topic 'android-ndk-legacy-toolchain'Brad King2023-02-072-1/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | cb0b9452e8 Android: Provide CMAKE_ANDROID_NDK_VERSION with NDK legacy toolchain file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8170
| * | | | Android: Provide CMAKE_ANDROID_NDK_VERSION with NDK legacy toolchain fileBrad King2023-02-062-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable has been provided since commit 746906242d (Android: Detect NDK version number, 2021-02-26, v3.20.0-rc3~1^2~3) when using CMake's NDK support or the modern NDK toolchain file. Since commit 005e2cdfb0 (Android: Do not use gold for ndk >= r22, 2021-02-26, v3.20.0-rc3~1^2) we need the value in our compiler/platform information files, so provide it when using the NDK legacy toolchain file too. Revert commit 1c86e397fe (Android/Clang: Tolerate undefined CMAKE_ANDROID_NDK_VERSION, 2022-09-16, v3.25.0-rc1~118^2) since the variable should now always be defined. Issue: #21772 Fixes: #24386
| * | | | Merge topic 'FindPython-CMP0007-NEW' into release-3.25Brad King2023-01-241-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 486b3c0850 FindPython: Policy CMP0007 must be set to NEW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8104
* | \ \ \ \ Merge topic 'FindCUDAToolkit-nvrtc-builtins'Brad King2023-02-071-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 9688a8ebc2 FindCUDAToolkit: Fix `nvrtc_builtins_static` library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8162