summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'required_find_commands'Brad King2020-03-0927-10/+125
|\ | | | | | | | | | | | | | | dc00809596 find_*: Add support for REQUIRED keyword cc070e66cd cmFindBase: Use in-class member initialization Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4435
| * find_*: Add support for REQUIRED keywordSylvain Joubert2020-03-0627-2/+121
| | | | | | | | | | | | In the same spirit as the REQUIRED keyword on find_package, this will stop cmake execution with an error on a failed find_program, find_file, find_path or find_library.
| * cmFindBase: Use in-class member initializationSylvain Joubert2020-03-062-8/+4
| |
* | Merge topic 'FindArmadillo-wrappers'Brad King2020-03-091-21/+62
|\ \ | | | | | | | | | | | | | | | | | | 38c6dd7b19 FindArmadillo: Add support for non-wrapper case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4418
| * | FindArmadillo: Add support for non-wrapper caseRyan Birmingham2020-03-061-21/+62
| | | | | | | | | | | | | | | | | | | | | Armadillo is typically built as a wrapper library, which is what this find module has historically supported, but it does not have to be. If not, then instead of armadillo itself, we need to link to some combination of dependencies and not armadillo.
* | | Merge branch 'release-3.16'Brad King2020-03-090-0/+0
|\ \ \
| * \ \ Merge branch 'ibmi-fix-libuv-build' into release-3.16Brad King2020-03-061-0/+19
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !4431
* | \ \ \ Merge branch 'release-3.17'Brad King2020-03-090-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'ibmi-fix-libuv-build' into release-3.17Brad King2020-03-091-0/+19
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 7d6bd14dca libuv: Add support for building on IBM i (OS400) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4431
* | | | | | Merge topic 'ibmi-fix-libuv-build'Brad King2020-03-091-0/+19
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d6bd14dca libuv: Add support for building on IBM i (OS400) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4431
| * | | | | libuv: Add support for building on IBM i (OS400)Jesse Gorzinski2020-03-061-0/+19
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-03-091-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-03-081-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-03-071-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'ConvertMSBuildXMLToJSON-default-mutable'Brad King2020-03-061-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98e735903a MSBuild: Fix python mutable default data structure Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Drew Dennison <dennison@mit.edu> Merge-request: !4432
| * | | | | MSBuild: Fix python mutable default data structureBrendon Go2020-03-061-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change default value of arguments to be None and instantiate new object inside function.
* | | | | | Merge branch 'release-3.16'Brad King2020-03-060-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'cmstd-IBM-i' into release-3.16Brad King2020-03-051-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | Merge-request: !4430
* | | | | | Merge branch 'release-3.17'Brad King2020-03-060-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'cmstd-IBM-i' into release-3.17Brad King2020-03-061-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 917db8163d cmstd: Remove -isystem option for IBM i (OS400) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4430
* | | | | | Merge topic 'cmstd-IBM-i'Brad King2020-03-061-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 917db8163d cmstd: Remove -isystem option for IBM i (OS400) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4430
| * | | | | cmstd: Remove -isystem option for IBM i (OS400)ThePrez2020-03-051-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Much like AIX, IBM i (OS identifier "OS400") implicitly adds `extern "C"` around system header files included with the `-isystem` option. Update the condition added by commit c688b401d3 (cmstd: Modernize CMake system headers, 2019-08-04, v3.16.0-rc1~81^2~1) to treat `IBM i` as we do AIX.
* | | | | Merge branch 'release-3.17'Brad King2020-03-060-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-3.16' into release-3.17Brad King2020-03-060-0/+0
| |\ \ \ \ | | |/ / /
* | | | | Merge branch 'release-3.17'Brad King2020-03-060-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge topic 'doc-add_custom_command-depends' into release-3.17Brad King2020-03-061-14/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 785f2b2df1 Help: Clarify add_custom_command DEPENDS conversion to file paths Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4434
* | \ \ \ \ Merge topic 'doc-add_custom_command-depends'Brad King2020-03-061-14/+30
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 785f2b2df1 Help: Clarify add_custom_command DEPENDS conversion to file paths Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4434
| * | | | | Help: Clarify add_custom_command DEPENDS conversion to file pathsBrad King2020-03-061-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit f5126badd8 (add_custom_command: convert DEPENDS path arguments to absolute paths, 2019-12-18, v3.17.0-rc1~263^2) we updated the documentation to describe the behavior introduced by that commit. However, the behavior was removed again by commit fd0ba705ce (add_custom_command: check if a relative path should be an in-source path, 2020-01-09, v3.17.0-rc1~141^2~4) without updating the documentation. Update the documentation again to describe the behavior as of the latter commit. Spell out the steps that `cmLocalGenerator::GetRealDependency` and `cmTargetTraceDependencies::IsUtility` use to add file-level and target-level dependencies.
* | | | | | Merge topic 'FindPython-artifacts-scope'Brad King2020-03-068-16/+138
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5b4c74238 FindPython: Add possibility to control scope of artifacts. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4426
| * | | | | | FindPython: Add possibility to control scope of artifacts.Marc Chevrier2020-03-058-16/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20362
* | | | | | | Merge topic 'modernize-memory-management'Brad King2020-03-0613-64/+76
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9de0355d4f Modernize memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4428
| * | | | | | | Modernize memory managementMarc Chevrier2020-03-0513-64/+76
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Update internals of various classes.
* | | | | | | Merge topic 'update-curl'Brad King2020-03-06227-6741/+13086
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85ad7190f3 curl: Set build options the way we need for CMake d61c3bd505 Merge branch 'upstream-curl' into update-curl 735ea3001a curl 2020-03-04 (b8d13668) 84dc14a967 curl: Update script to get curl 7.69.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4429
| * | | | | | | curl: Set build options the way we need for CMakeBrad King2020-03-041-0/+7
| | | | | | | |
| * | | | | | | Merge branch 'upstream-curl' into update-curlBrad King2020-03-04226-6740/+13074
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2020-03-04 (b8d13668)
| | * | | | | | | curl 2020-03-04 (b8d13668)Curl Upstream2020-03-04226-6739/+13074
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit b8d1366852fd0034374c5de1e4968c7a224f77cc (curl-7_69_0).
| * | | | | | | | curl: Update script to get curl 7.69.0Brad King2020-03-041-1/+5
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-03-061-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge topic 'macos_framework_postfix'Kyle Edwards2020-03-0515-18/+240
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad3f69c86e Add support for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4289
| * | | | | | | | Add support for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>Alexandru Croitor2020-03-0415-18/+240
| | | | | | | | |
* | | | | | | | | Merge topic 'objlib-transitive-deps'Brad King2020-03-058-15/+71
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a833aa1167 Fix dependencies on targets linked through object libraries 3b3de0fd17 Tests: Extend ObjectLibrary test with case for object lib dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4427
| * | | | | | | | | Fix dependencies on targets linked through object librariesBrad King2020-03-044-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an object library is used via `target_link_libraries`, any targets listed in the object library's `INTERFACE_LINK_LIBRARIES` closure should become direct dependencies of the consuming target. However, these were accidentally left out by `cmComputeTargetDepends::CollectTargetDepends` because object libraries are encountered through external object sources first and then added to the `emitted` set which blocks them from being processed as link dependencies. This was not noticed by the test case in commit bab24e782c (target_link_libraries: Propagate dependencies of object libraries, 2018-12-10, v3.14.0-rc1~260^2) because the relevant dependency appears transitively through the object library target itself. Re-order the logic to process link dependencies first, and then external object sources. That way object libraries used via `target_link_libraries` will be treated as such by dependency analysis. This also adds missing backtrace information for object libraries used via `target_link_libraries`. The missing information was mentioned in a FIXME comment in the RunCMake.FileAPI test added by commit ea0a060168 (fileapi: Add test for codemodel v2, 2018-11-09, v3.14.0-rc1~257^2~7). That comment itself was dropped by commit a0de350e2f (FileAPI test: Break gen_check_targets() into JSON files, 2020-02-07), but we can now update the corresponding location in the `.json` files to have the now-expected backtrace information. Fixes: #20421
| * | | | | | | | | Tests: Extend ObjectLibrary test with case for object lib dependenciesBrad King2020-03-045-0/+24
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the test case from commit bab24e782c (target_link_libraries: Propagate dependencies of object libraries, 2018-12-10, v3.14.0-rc1~260^2) to the main ObjectLibrary test.
* | | | | | | | | Merge branch 'release-3.17'Brad King2020-03-050-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge topic 'ninja-multi-custom-command-deps' into release-3.17Brad King2020-03-054-7/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 081c4679f7 Ninja Multi-Config: Don't build target dependencies for custom commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4423
* | \ \ \ \ \ \ \ \ Merge topic 'ninja-multi-custom-command-deps'Brad King2020-03-054-7/+5
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 081c4679f7 Ninja Multi-Config: Don't build target dependencies for custom commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4423
| * | | | | | | | | Ninja Multi-Config: Don't build target dependencies for custom commandsKyle Edwards2020-03-034-7/+5
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If cross-config mode is used, and a target depends on another target as well as a custom command, we don't want the custom command to also depend on the depended target, as that would build targets unnecessarily. Fix this behavior.
* | | | | | | | | Merge topic 'update-kwsys'Brad King2020-03-0519-967/+998
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e6b07f5ff Merge branch 'upstream-KWSys' into update-kwsys ec33e3600c KWSys 2020-03-04 (6af2e592) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4424
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-03-0419-967/+998
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-03-04 (6af2e592)
| | * | | | | | | | | KWSys 2020-03-04 (6af2e592)KWSys Upstream2020-03-0419-967/+998
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 6af2e59217a7e10ed507da564a1445b60ac2a095 (master). Upstream Shortlog ----------------- Hans Johnson (17): 81d1e737 STYLE: Use modern path naming 28b8e6c2 STYLE: Convert CMake-language commands to lower case 6ce3d69a DOC: Update documentation for modern add_subdirectory. 8a7fe7ac STYLE: Remove redundant void argument lists 1c3e193d COMP: Use nullptr instead of 0 or NULL 2a4c1252 STYLE: Replace integer literals which are cast to bool. 0fe7214d STYLE: Make prototype match definition names 3b30d0ff STYLE: Make prototype match definition names 691d5612 PERF: readability container size empty 7be4043f STYLE: Prefer c++11 'using' to 'typedef' acc916ed COMP: Prefer const pointer when value does not change 4c7f64eb COMP: Prefer const member functions d07092a0 STYLE: Use default member initialization 6d20e7c9 STYLE: Prefer = default to explicitly trivial implementations 91429382 PERF: emplace_back method results in potentially more efficient code cc8fc323 STYLE: Use auto for variable type matches the type of the initializer 6621b069 STYLE: Use range-based loops from C++11 Julien Schueller (1): a1a261ac CMake: Fix psapi lib name on case-sensitive fs
generated by cgit v0.12 at 2025-08-26 09:45:28 (GMT)