summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* MSVC: Do not add /GR to CMAKE_CXX_FLAGS by defaultBrad King2020-11-131-1/+7
| | | | | | | | | | | | The `/GR` flag has been on by default since MSVC cl 14.0 from VS 2005. Remove it from the default flags to make it easier for projects to pass `/GR-` themselves to turn it off. Projects may be using string processing to replace `/GR` with another flag, so we cannot simply drop it. Add a policy to drop it in a compatible way. Fixes: #21428
* MSVC: Factor out initialization of /GR flagBrad King2020-11-131-4/+8
|
* Merge topic 'usejava_helpers'Brad King2020-11-134-25/+7
|\ | | | | | | | | | | | | cb28d9af1f UseJava: Move helper scripts to subdirectory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5501
| * UseJava: Move helper scripts to subdirectoryNikita Nemkin2020-11-124-25/+7
| | | | | | | | Also, exclude them from the help module index.
* | Merge topic 'android-abis'Brad King2020-11-131-61/+76
|\ \ | | | | | | | | | | | | | | | | | | 3a2bb717ee Android: load ABI information from abis.cmake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5499
| * | Android: load ABI information from abis.cmakeHaibo Huang2020-11-121-61/+76
| |/ | | | | | | | | They are added to NDK and planned to release in r23: https://android-review.googlesource.com/c/platform/ndk/+/1493421
* | Merge topic 'qtifw-archivegen'Brad King2020-11-131-0/+10
|\ \ | | | | | | | | | | | | | | | | | | 5ab75dd7dd CPack/IFW: Locate the archivegen utility Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5503
| * | CPack/IFW: Locate the archivegen utilityErlend Egeberg Aasland2020-11-121-0/+10
| | | | | | | | | | | | Fixes: #21427
* | | Merge topic 'qtifw-4.0'Brad King2020-11-131-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 63ae96a317 CPack/IFW: Add support for QtIFW 4.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5502
| * | | CPack/IFW: Add support for QtIFW 4.0Erlend Egeberg Aasland2020-11-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | installerbase v4.0 segfaults on macOS if you pass `--framework-version`, so re-order flags to try `--version` first. Fixes: #21426
* | | | Merge topic 'xcode-compiler-id-path'Brad King2020-11-134-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcbae3f71e Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5506
| * | | | Xcode: Extract CMAKE_<LANG>_COMPILER from compiler id with multiple archsBrad King2020-11-124-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When targeting a platform that supports multiple architectures, Xcode may choose to build all of them in our small compiler id project. Update the regex we use to extract the path to the compiler from the Xcode output to account for this. Fixes: #21425
* | | | | Merge topic 'xcode-compiler-id-arch'Brad King2020-11-132-2/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98849039cc Xcode: Default to arm64 arch on Apple Silicon hosts during compiler id Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5505
| * | | | | Xcode: Default to arm64 arch on Apple Silicon hosts during compiler idBrad King2020-11-122-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b6c60f14b6 (macOS: Default to arm64 architecture on Apple Silicon hosts, 2020-09-28, v3.19.0-rc1~63^2) we forgot to update the compiler id architecture selection added by commit 26673bf480 (Xcode: Explicitly specify default native architecture on macOS, 2020-07-16, v3.18.1~20^2). Issue: #21425
| * | | | | Merge topic 'FindRuby-vs-runtimes' into release-3.19Brad King2020-11-121-7/+13
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d4a16427e2 FindRuby: Consider more VS runtime suffix combinations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5486
| * | | | | Merge topic 'android-abi' into release-3.19Brad King2020-11-111-4/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a585b75df9 Android: Use NDK_KNOWN_DEVICE_ABI{32,64}S instead of NDK_DEFAULT_ABIS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5488
* | \ \ \ \ \ Merge topic 'ctest-batch'Brad King2020-11-122-12/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa754e2913 CTest: Remove additional batch test variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5494
| * | | | | | | CTest: Remove additional batch test variablesSeth R Johnson2020-11-112-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up commit f984296ba8 (CTest: Remove unfinished batch test mode, 2017-12-08, v3.11.0-rc1~217^2).
* | | | | | | | Merge topic 'FindBLAS/OpenBLAS-OpenMP'Brad King2020-11-121-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7f3d8987a FindBLAS: Add dependency of OpenBLAS on OpenMP for BLA_STATIC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5487
| * | | | | | | | FindBLAS: Add dependency of OpenBLAS on OpenMP for BLA_STATICEisuke Kawashima2020-11-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16221
* | | | | | | | | Merge topic 'FindRuby-vs-runtimes'Brad King2020-11-121-7/+13
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | d4a16427e2 FindRuby: Consider more VS runtime suffix combinations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5486
| * | | | | | | FindRuby: Consider more VS runtime suffix combinationsSilvio Traversaro2020-11-111-7/+13
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are needed to find recent Ruby versions for builds using recent VS versions. Fixes: #21066
* | | | | | | Merge topic 'FortranCInterface-CMP0056'Brad King2020-11-112-0/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15e77fbd40 FortranCInterface: Honor CMAKE_EXE_LINKER_FLAGS under CMP0056 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5483
| * | | | | | | FortranCInterface: Honor CMAKE_EXE_LINKER_FLAGS under CMP0056Brad King2020-11-102-0/+18
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Policy CMP0056 determines whether `CMAKE_EXE_LINKER_FLAGS` are passed into the test project used by the source-file signature of `try_compile`. That affects how implicit link directories are detected, so we need to also honor the policy for the source-directory signature of `try_compile` used in FortranCInterface in order to get matching link directories. Fixes: #21408
* | | | | | | Merge topic 'android-abi'Brad King2020-11-111-4/+13
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | a585b75df9 Android: Use NDK_KNOWN_DEVICE_ABI{32,64}S instead of NDK_DEFAULT_ABIS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5488
| * | | | | Android: Use NDK_KNOWN_DEVICE_ABI{32,64}S instead of NDK_DEFAULT_ABISHaibo Huang2020-11-101-4/+13
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise logic from commit 1ab574a0f4 (Android: Add support for NDK r22, 2020-10-07, v3.19.0-rc1~18^2) that loads ABI tables from the NDK. `NDK_DEFAULT_ABIS` means the abis to build by default. Use `NDK_KNOWN_DEVICE_ABI{32,64}S` instead. In practise they have never been different. Fix to make it more precise.
* | | | | Merge topic 'android-root'Brad King2020-11-101-32/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbc51a8be3 Android: restructure android search paths Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: huangqinjin <huangqinjin@gmail.com> Merge-request: !5479
| * | | | | Android: restructure android search pathsHaibo Huang2020-11-091-32/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Set CMAKE_FIND_ROOT_PATH unconditionally. Revise the implementation from commit a7f41a7ee4 (Android: Fix find_* search order within NDK for unified toolchains, 2020-10-13). In the old implementation, if people set CMAKE_FIND_ROOT_PATH, CMAKE_ANDROID_NDK won't be added to find root. And all paths added to CMAKE_SYSTEM_*_PATH below will be rerooted to the user specified root. 2. Add api level specific library path to CMAKE_SYSTEM_PREFIX_PATH. As the discussion in [1], some people want the paths added by UnixPaths.cmake. They install their libraries according to GNUInstallDirs [2]. As a result, we cannot clear CMAKE_SYSTEM_PREFIX_PATH. It includes /usr so no matter what we specify in CMAKE_SYSTEM_LIBRARY_PATH, /usr/lib/<arch> will be searched first. The author also pointed out a way to solve this issue [3]. In addition to other paths, CMake also searches <root>/<prefix> [4]. So we can add the API specific lib path to the beginning of CMAKE_SYSTEM_PREFIX_PATH, to have it searched first. [1] https://android-review.googlesource.com/c/platform/ndk/+/1486800 [2] https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html [3] https://github.com/android/ndk/issues/1179#issuecomment-613435081 [4] https://gitlab.kitware.com/cmake/cmake/-/blob/11425041f04fd0945480b8f9e9933d1549b93981/Source/cmSearchPath.cxx#L202
* | | | | | Merge topic 'python3.10'Brad King2020-11-102-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | bb2ebbf241 FindPython{Interp,Libs}: Add support for version 3.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5482
| * | | | FindPython{Interp,Libs}: Add support for version 3.10Miro Hrončok2020-11-092-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | Extend the change from commit 23cd98a66a (FindPython: Add support of version 3.10, 2020-10-16, v3.19.0-rc2~25^2) to cover the legacy `FindPython{Interp,Libs}` modules too.
| * | | Merge topic 'apple-v4-tbd-file-arch-lookup' into release-3.19Brad King2020-11-061-3/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c6797e03e Apple: Update SDK architecture detection for tbd file version 4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5470
| * \ \ \ Merge topic 'FindPostgreSQL-13' into release-3.19Brad King2020-11-061-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3f09f1c96 FindPostgreSQL: support version 13 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5468
* | \ \ \ \ Merge topic 'FindProtobuf-multiple-extensions'Brad King2020-11-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2bb3c0a44b FindProtobuf: Support files with multiple extensions (#18329) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5476
| * | | | | | FindProtobuf: Support files with multiple extensions (#18329)Florian Franzen2020-11-061-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'TestBigEndian-use-abi-result'Brad King2020-11-091-8/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcc89bda1d TestBigEndian: Re-implement using byte order detected from ABI check 412ce907a2 Tests: Prepare RunCMake.ABI cases to run more checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5477
| * | | | | | TestBigEndian: Re-implement using byte order detected from ABI checkBrad King2020-11-061-8/+28
| |/ / / / / | | | | | | | | | | | | | | | | | | Document the module as deprecated in favor of the ABI check results.
* | | | | | Merge topic 'android-flags'Brad King2020-11-0910-56/+63
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94d87afece Android: allow NDK to control cflags / ldflags 85e5139aba Android: Move *_LLVM_TRIPLE to the centralized table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5461
| * | | | | Android: allow NDK to control cflags / ldflagsHaibo Huang2020-11-061-7/+27
| | | | | |
| * | | | | Android: Move *_LLVM_TRIPLE to the centralized tableHaibo Huang2020-11-0610-49/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to skip `abi-*.cmake` in the next change. In the future we may move all this information to the NDK.
* | | | | | Merge topic 'android-build-type'Brad King2020-11-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3dae826e43 Android: default to RelWithDebInfo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5465
| * | | | | | Android: default to RelWithDebInfoHaibo Huang2020-11-041-1/+1
| | | | | | |
* | | | | | | Merge topic 'FindICU-naming'Brad King2020-11-061-8/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21cb588629 FindICU: Correct variable names to match documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5451
| * | | | | | | FindICU: Correct variable names to match documentationRoger Leigh2020-10-311-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add "ICU_" suffix to all _FOUND variables * Ensure cache variables can also be used with correct ICU_ suffix and compatibility name * Improve ICU_DEBUG messages to verify compatibility and corrected variable names are set to the correct values
* | | | | | | | Merge topic 'cpack-nuget'Brad King2020-11-062-5/+78
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41ae7c4e51 CPack/NuGet: Add settings for the license, icon, and language Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5415
| * | | | | | | | CPack/NuGet: Add settings for the license, icon, and languageBob Apthorpe2020-11-052-5/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the XML Schema. Fixes: #21348
* | | | | | | | | Merge topic 'apple-v4-tbd-file-arch-lookup'Brad King2020-11-061-3/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c6797e03e Apple: Update SDK architecture detection for tbd file version 4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5470
| * | | | | | | | Apple: Update SDK architecture detection for tbd file version 4Tor Arne Vestbø2020-11-051-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the `.tbd` parsing from commit 170e598add (iOS: Fix detection of supported SDK architectures, 2020-04-16, v3.17.2~11^2) to support `.tbd` file version 4.
* | | | | | | | | Merge topic 'FindPostgreSQL-13'Brad King2020-11-061-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3f09f1c96 FindPostgreSQL: support version 13 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5468
| * | | | | | | | FindPostgreSQL: support version 13Pavel Cernohorsky2020-11-051-1/+1
| |/ / / / / / /
* | | | | | | | Merge topic 'help_ctest_cuda_memcheck'Craig Scott2020-11-062-1/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e620bb7293 Help: Add cuda-memcheck to CTest documentation fb98883e2b CTest: Add cuda-memcheck to Dart and CTest module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5469
generated by cgit v0.12 at 2025-08-30 01:23:24 (GMT)