summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 branch 'release-3.19'Brad King2020-11-130-0/+0
|\ \
| * \ Merge topic 'xcode-compiler-id-arch' into release-3.19Brad 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
* | \ \ 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
* | | CMake Nightly Date StampKitware Robot2020-11-131-1/+1
| | |
* | | 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 'suppress-link-messages'Brad King2020-11-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e2eba6b4c MSVC: Suppress rc/mt/link output unless verbose is requested Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5492
| * | | | MSVC: Suppress rc/mt/link output unless verbose is requestedOrgad Shaneh2020-11-111-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output like the following is typically not interesting at all: LINK : program database F:\Project\Project.pdb missing; performing full link Creating library Project.lib and object Project.exp Fixes #21422
* | | | 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 branch 'release-3.19'Brad King2020-11-120-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'FindPython-version-range-fix-tests' into release-3.19Brad King2020-11-121-16/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a00603af0b FindPython: Fix version range tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5497
* | \ \ \ \ Merge topic 'FindPython-version-range-fix-tests'Brad King2020-11-121-16/+25
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a00603af0b FindPython: Fix version range tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5497
| * | | | | FindPython: Fix version range testsMarc Chevrier2020-11-111-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | Tests must be successful when multiple versions are installed.
* | | | | | Merge branch 'release-3.19'Brad King2020-11-120-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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 '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
* | | | | | | CMake Nightly Date StampKitware Robot2020-11-121-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.19'Brad King2020-11-110-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'envvar_versions' into release-3.19Brad King2020-11-1128-50/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5934a6275c Help: Fix `.. versionadded` directives in environment variable docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5498
* | | | | | | Merge topic 'envvar_versions'Brad King2020-11-1128-50/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5934a6275c Help: Fix `.. versionadded` directives in environment variable docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5498
| * | | | | | Help: Fix `.. versionadded` directives in environment variable docsNikita Nemkin2020-11-1128-50/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many environment variables were documented late and got assigned wrong versions by the script. (The whole Help/envvar section was only added in 3.10). Issue: #19715
* | | | | | 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 branch 'release-3.19'Brad King2020-11-110-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'ninja-cleandead-no-dyndep' into release-3.19Brad King2020-11-112-2/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5011399c5 Ninja: Avoid cleandead with dyndep bindings for Fortran module dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5490
* | \ \ \ \ \ Merge topic 'ninja-cleandead-no-dyndep'Brad King2020-11-112-2/+10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5011399c5 Ninja: Avoid cleandead with dyndep bindings for Fortran module dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5490
| * | | | | | Ninja: Avoid cleandead with dyndep bindings for Fortran module dependenciesBrad King2020-11-102-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja `cleandead` tool does not account for implicit outputs discovered by `dyndep` bindings and can remove Fortran `.mod` files that are still needed. Disable the `cleandead` step when using `dyndep` bindings. Fixes: #21406
* | | | | | | Merge branch 'release-3.19'Brad King2020-11-110-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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 '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 branch 'release-3.19'Brad King2020-11-110-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'get_filename_component-clarification' into release-3.19Brad King2020-11-111-2/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c0e05671d3 Help/get_filename_component: clarify NAME_W[L]E summaries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5489
* | | | | | | Merge topic 'get_filename_component-clarification'Brad King2020-11-111-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | c0e05671d3 Help/get_filename_component: clarify NAME_W[L]E summaries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5489
| * | | | | Help/get_filename_component: clarify NAME_W[L]E summariesBen Boeckel2020-11-101-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | There was an ambiguity in the wording with the meaning of "or" typically meaning exclusive-or in prose. Instead, ensure that the easiest parsing is clear that the directory part is always removed.
* | | | | CMake Nightly Date StampKitware Robot2020-11-111-1/+1
| | | | |
* | | | | Merge topic 'versionadded_commands'Brad King2020-11-1058-434/+939
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c705279bae Help: Add `.. versionadded` directives to commands documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !5481
| * | | | | Help: Add `.. versionadded` directives to commands documentationNikita Nemkin2020-11-0958-434/+939
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change ony concerns directives that appear in the document body. The guidelines for inserting version directives: * Baseline version is CMake 3.0, i.e. directives start at 3.1. * Always use `.. versionadded::` directive, avoid ad-hoc version references. Exception: policy pages. * For new command signatures, put `versionadded` on a separate line after the signature. * For a group of new signatures in a new document section, a single version note at the beginning of the section is sufficient. * For new options, put `versionadded` on a separate line before option description. * If all the option descriptions in the list are short one-liners, it's fine to put `versionadded` on the same line as the description. * If multiple option descriptions in close proximity would have the same ..versionadded directive, consider adding a single directive after the list, mentioning all added options. * For compact value lists and sub-option lists, put a single `versionadded` directive after the list mentioning all additions. * When a change is described in a single paragraph, put `versionadded` into that paragraph. * When only part of the paragraph has changed, separate the changed part if it doesn't break the flow. Otherwise, write a follow-up clarification paragraph and apply version directive to that. * When multiple version directives are close by, order earlier additions before later additions. * Indent related lists and code blocks to include them in the scope of `versionadded` directive. Issue: #19715
* | | | | | Merge topic 'android-root'Brad King2020-11-103-32/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-093-32/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'release-3.19'Brad King2020-11-100-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'python3.10' into release-3.19Brad 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
* | \ \ \ \ \ \ 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.
* | | | | | | CMake Nightly Date StampKitware Robot2020-11-101-1/+1
| |_|_|_|/ / |/| | | | |
generated by cgit v0.12 at 2025-02-21 22:45:52 (GMT)