summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Replace some `versionadded` directives with `versionchanged`Nikita Nemkin2020-11-1213-19/+19
| | | | | | | | `.. versionchanged` directive might be more appropriate when documentation refers to previous CMake version, old behavior or a policy, and there's no new parameter or a variable involved. Issue: #19715
* 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
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'release-3.19'Brad King2020-11-090-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'doc-html-lang' into release-3.19Brad King2020-11-091-0/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | f25e4313ac Utilities/Sphinx: Tell Sphinx that documentation is written in English Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5480
* | | | | Merge topic 'doc-html-lang'Brad King2020-11-091-0/+1
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | | | | | | | | f25e4313ac Utilities/Sphinx: Tell Sphinx that documentation is written in English Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5480
| * | | Utilities/Sphinx: Tell Sphinx that documentation is written in EnglishBrad King2020-11-091-0/+1
| |/ / | | | | | | | | | Fixes: #21409
* | | 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 'ninja-dyndep-refactor'Brad King2020-11-092-178/+156
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 941be1d356 cmNinjaTargetGenerator: Clarify variable names for preprocessing conditions 33a8e0bb09 cmNinjaTargetGenerator: Simplify scan rule depfile selection bff1871c39 cmNinjaTargetGenerator: Generalize GetScanRule helper 9f60e8aa52 cmNinjaTargetGenerator: Remove redundant conditions for dyndep blocks 43fe7e0c97 cmNinjaTargetGenerator: Revise conditions to clarify dyndep code paths 1416012f2c cmNinjaTargetGenerator: Clarify scan rule code grouping f2eec04728 cmNinjaTargetGenerator: Clarify scan rule helper functions 170cfc764d cmNinjaTargetGenerator: Drop unnecessary mutation ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5478
| * | | | cmNinjaTargetGenerator: Clarify variable names for preprocessing conditionsBrad King2020-11-061-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | What is important about code paths for Fortran's explicit preprocessing is that the compilation step following it does not do preprocessing.
| * | | | cmNinjaTargetGenerator: Simplify scan rule depfile selectionBrad King2020-11-061-30/+32
| | | | | | | | | | | | | | | | | | | | | | | | | The depfile can always be the first output of the build statement with a `.d` suffix added. This approach easily avoids conflicts.
| * | | | cmNinjaTargetGenerator: Generalize GetScanRule helperBrad King2020-11-061-30/+27
| | | | | | | | | | | | | | | | | | | | | | | | | Allow the caller to provide any number of commands, and to choose which ones get a launcher.
| * | | | cmNinjaTargetGenerator: Remove redundant conditions for dyndep blocksBrad King2020-11-061-26/+19
| | | | | | | | | | | | | | | | | | | | | | | | | The GetScanCommand and GetScanBuildStatement helpers are called only in code paths for dyndep. Drop their checks for this condition.
| * | | | cmNinjaTargetGenerator: Revise conditions to clarify dyndep code pathsBrad King2020-11-061-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the scan-related code paths are actually about dyndep rather than explicit preprocessing. It just happens that the implementation for Fortran requires explicit preprocessing.
| * | | | cmNinjaTargetGenerator: Clarify scan rule code groupingBrad King2020-11-061-24/+28
| | | | |
| * | | | cmNinjaTargetGenerator: Clarify scan rule helper functionsBrad King2020-11-061-73/+68
| | | | | | | | | | | | | | | | | | | | | | | | | Revise names to clarify that these helpers are for the dependency scanning commands, which may happen to preprocess.
| * | | | cmNinjaTargetGenerator: Drop unnecessary mutationBrad King2020-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | GetPreprocessScanRule's caller always has `vars.Source` set to `$in`.
| * | | | cmNinjaTargetGenerator: Clarify method namesBrad King2020-11-062-16/+15
| | | | |
| * | | | cmNinjaTargetGenerator: Consolidate redundant methodsBrad King2020-11-062-11/+4
| | |_|/ | |/| |
* | | | Merge topic 'TestBigEndian-use-abi-result'Brad King2020-11-0913-13/+116
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0613-8/+96
| | | | | | | | | | | | | | | | | | | | Document the module as deprecated in favor of the ABI check results.
| * | | | Tests: Prepare RunCMake.ABI cases to run more checksBrad King2020-11-065-5/+20
| | |/ / | |/| |
* | | | 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
generated by cgit v0.12 at 2025-09-15 09:43:07 (GMT)