summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* OpenWatcom: Add infrastructure to link to object filesBrad King2021-05-295-11/+44
|
* cmComputeLinkInformation: Improve type safety of item IsPath memberBrad King2021-05-297-24/+35
| | | | Use an enum to avoid implicit conversions to bool.
* cmComputeTargetDepends: Factor out helper to add object library dependencyBrad King2021-05-282-20/+32
|
* cmGeneratorTarget: Refactor link item lookupBrad King2021-05-283-18/+26
| | | | | Look up items individually so the call sites can do something with the result besides appending to a vector.
* cmGeneratorTarget: Give temporary link impl item an explicit nameBrad King2021-05-281-2/+2
|
* cmMakefile: Register explicit object sources more efficientlyBrad King2021-05-281-1/+2
| | | | `AddTargetObject` knows the location of object files.
* cmGeneratorExpressionNode: Constify local variableBrad King2021-05-281-1/+1
|
* Merge branch 'release-3.20'Brad King2021-05-280-0/+0
|\
| * Merge topic 'ci-msvc-14.29-16.10' into release-3.20Brad King2021-05-281-4/+4
| |\ | | | | | | | | | | | | | | | | | | 59d9fa7131 gitlab-ci: Update Windows builds to MSVC 19.29-16.10 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6172
* | \ Merge topic 'ci-msvc-14.29-16.10'Brad King2021-05-281-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c33b4e3b1 Merge branch 'master' into ci-msvc-14.29-16.10 59d9fa7131 gitlab-ci: Update Windows builds to MSVC 19.29-16.10 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6172
| * \ \ Merge branch 'master' into ci-msvc-14.29-16.10Brad King2021-05-281290-10094/+26363
| |\ \ \ | |/ / / |/| | / | | |/ | |/|
* | | Merge branch 'release-3.20'Brad King2021-05-280-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'vs-16.10-map-external-warnings' into release-3.20Brad King2021-05-281-0/+35
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 9054cd05e6 VS: Add flag table entries for '/external:W*' flags in VS 16.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6171
* | \ \ Merge topic 'vs-16.10-map-external-warnings'Brad King2021-05-281-0/+35
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 9054cd05e6 VS: Add flag table entries for '/external:W*' flags in VS 16.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6171
| * | | VS: Add flag table entries for '/external:W*' flags in VS 16.10Brad King2021-05-281-0/+35
| | | | | | | | | | | | | | | | Fixes: #22255
* | | | Merge branch 'release-3.20'Brad King2021-05-280-0/+0
|\ \ \ \ | | |/ / | |/| |
* | | | Merge topic 'vs-toolset-version'Brad King2021-05-281-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a60141feaa VS: Add special case for '-T version=14.29.16.10' under VS 16.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6169
* \ \ \ \ Merge topic 'binutils-consistency'Brad King2021-05-283-43/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 047585edc6 BinUtils: Find linker and librarian for Intel compilers on Windows 995f5b4e7b BinUtils: Find linker and librarian for OpenWatcom cf82300a63 BinUtils: Clarify search logic and make it more consistent Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6164
| * | | | | BinUtils: Find linker and librarian for Intel compilers on WindowsBrad King2021-05-272-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our Intel linker and archiver rules to use the `<CMAKE_LINKER>` and `<CMAKE_AR>` placeholders instead of hard-coding the tool names.
| * | | | | BinUtils: Find linker and librarian for OpenWatcomBrad King2021-05-272-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our OpenWatcom linker and archiver rules to use the `<CMAKE_LINKER>` and `<CMAKE_AR>` placeholders instead of hard-coding the tool names.
| * | | | | BinUtils: Clarify search logic and make it more consistentBrad King2021-05-271-34/+41
| | | | | | | | | | | | | | | | | | | | | | | | Consistently consider more-specific names before less-specific names.
* | | | | | Merge topic 'update-curl'Brad King2021-05-28147-4480/+6392
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d199fc4bf8 Utilities: Add missing hard-coded try_compile results for libarchive f361cb1fb3 Utilities: Update hard-coded try_compile results for curl 1.77.0 cd40922edb Merge branch 'upstream-curl' into update-curl 18b2a8d760 curl 2021-05-26 (6b951a69) 2f38e5d214 curl: Update script to get curl 7.77.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6168
| * | | | | | Utilities: Add missing hard-coded try_compile results for libarchiveBrad King2021-05-271-0/+3
| | | | | | |
| * | | | | | Utilities: Update hard-coded try_compile results for curl 1.77.0Brad King2021-05-271-0/+4
| | | | | | |
| * | | | | | Merge branch 'upstream-curl' into update-curlBrad King2021-05-27145-4479/+6384
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2021-05-26 (6b951a69)
| | * | | | | | curl 2021-05-26 (6b951a69)Curl Upstream2021-05-27145-4479/+6381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 6b951a6928811507d493303b2878e848c077b471 (curl-7_77_0).
| * | | | | | | curl: Update script to get curl 7.77.0Brad King2021-05-271-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'WriteBasicConfigVersion_support_leading_zeroes'Brad King2021-05-288-6/+977
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e609afeb5f WriteBasicConfigVersion supports version strings such as 21.07.04 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6167
| * | | | | | | | WriteBasicConfigVersion supports version strings such as 21.07.04Robert Maynard2021-05-278-6/+977
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22207
* | | | | | | | | Merge topic 'doc-test-regex-v-exit-code'Brad King2021-05-283-2/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91b8676f8c Help: Clarify {PASS,FAIL}_REGULAR_EXPRESSION semantics w.r.t. exit code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6165
| * | | | | | | | | Help: Clarify {PASS,FAIL}_REGULAR_EXPRESSION semantics w.r.t. exit codeBrad King2021-05-273-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cross-reference them with each other and `SKIP_REGULAR_EXPRESSION`.
* | | | | | | | | | Merge topic 'deprecate-cmake-cfg-intdir'Brad King2021-05-281-5/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e71c4f7729 CMAKE_CFG_INTDIR: Formally deprecate in favor of $<CONFIG> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6163
| * | | | | | | | | | CMAKE_CFG_INTDIR: Formally deprecate in favor of $<CONFIG>Kyle Edwards2021-05-271-5/+6
| |/ / / / / / / / /
* | | | | | | | | | CMake Nightly Date StampKitware Robot2021-05-281-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'release-3.20'Brad King2021-05-270-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge topic 'xcode-link-TARGET_OBJECTS'Brad King2021-05-273-11/+9
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ae72ef74b Xcode: Enable multi-arch TARGET_OBJECTS genex in [INTERFACE_]LINK_LIBRARIES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6161
| * | | | | | | Xcode: Enable multi-arch TARGET_OBJECTS genex in [INTERFACE_]LINK_LIBRARIESBrad King2021-05-263-11/+9
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | This was an oversight in the original implementation.
* | | | | | | CMake Nightly Date StampKitware Robot2021-05-271-1/+1
| | | | | | |
* | | | | | | Merge topic 'cpack-install-opts'Craig Scott2021-05-267-0/+81
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26e36111d3 CPack: Implement new variable CPACK_CUSTOM_INSTALL_VARIABLES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6141
| * | | | | | CPack: Implement new variable CPACK_CUSTOM_INSTALL_VARIABLESNils Gladitz2021-05-237-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new variable allows projects to define custom key=value pairs of variables to be set in CPack cmake_install.cmake script invocations. This allows install(SCRIPT|CODE) to be parameterized at runtime.
* | | | | | | Merge topic 'ninja-absolute-paths'Brad King2021-05-268-41/+67
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c564a3e3ff Ninja: Always compile sources using absolute paths eb98d45111 Ninja: Handle depfiles with absolute paths to generated files in Ninja < 1.7 48471cfd18 cmNinjaNormalTargetGenerator: Factor out build event byproduct collection 18408c0b88 cmGlobalNinjaGenerator: Add helper to compute absolute paths for build.ninja efb8d7b4a1 cmNinjaTargetGenerator: Reduce string copies in ConvertToNinjaPath wrapper fb3a57575a cmNinjaTargetGenerator: Rename source file path lookup method for clarity 0f2b1c9d1b cmNinjaTargetGenerator: Remove GetSourceFilePath call with different semantics dfc98774a2 cmNinjaTargetGenerator: Rename local variable for clarity ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6148
| * | | | | | | Ninja: Always compile sources using absolute pathsBrad King2021-05-255-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja generator traditionally referenced source files and include directories using paths relative to the build directory if they could be expressed without a `../` sequence that leaves the build and source directories. For example, when using a `build/` directory inside the source tree, sources would be compiled as `-c ../src.c` and include directories would be referenced as `-I ../include`. This approach matches the traditional Ninja convention of using relative paths whenever possible, but has undesirable side effects such as: * Compiler diagnostic messages may not use absolute paths, making it harder for IDEs/editors to find the referenced sources or headers. * Debug symbols may not use absolute paths, making it harder for debuggers to find the referenced sources or headers. * Different results depending on the path to the build tree relative to the source tree. * Inconsistent with the Makefile generators, which use absolute paths. Switch to always using absolute paths to reference source files and include directories on compiler command lines. While alternative solutions for diagnostic messages and debug symbols may exist with specific tooling, this is the simplest and most consistent approach. Note that a previous attempt to do this in commit 955c2a630a (Ninja: Use full path for all source files, 2016-08-05, v3.7.0-rc1~275^2) was reverted by commit 666ad1df2d (Revert "Ninja: Use full path for all source files", 2017-02-24, v3.8.0-rc2~9^2) due to problems hooking up depfile dependencies on generated files. This time, the changes in commit 2725ecff38 (Ninja: Handle depfiles with absolute paths to generated files, 2021-05-19) should avoid those problems. Fixes: #13894, #17450
| * | | | | | | Ninja: Handle depfiles with absolute paths to generated files in Ninja < 1.7Brad King2021-05-251-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the change from commit 2725ecff38 (Ninja: Handle depfiles with absolute paths to generated files, 2021-05-19) to work on versions of Ninja that do not support implicit outputs. Specify the absolute paths as normal outputs on such versions. Issue: #13894, #21865
| * | | | | | | cmNinjaNormalTargetGenerator: Factor out build event byproduct collectionBrad King2021-05-251-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was left out of commit 68e5f92cad (cmGlobalNinjaGenerator: Factor out custom command output collection, 2021-05-18).
| * | | | | | | cmGlobalNinjaGenerator: Add helper to compute absolute paths for build.ninjaBrad King2021-05-253-0/+15
| | | | | | | |
| * | | | | | | cmNinjaTargetGenerator: Reduce string copies in ConvertToNinjaPath wrapperBrad King2021-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The global generator's method returns a reference to a cached value. Return that from the wrapper too.
| * | | | | | | cmNinjaTargetGenerator: Rename source file path lookup method for clarityBrad King2021-05-253-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `GetSourceFilePath` method is meant only for compiled sources, and automatically handles converting it to a path for the Ninja build manifest. Rename the method to clarify both.
| * | | | | | | cmNinjaTargetGenerator: Remove GetSourceFilePath call with different semanticsBrad King2021-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference external object files using `ConvertToNinjaPath` directly. `GetSourceFilePath` is meant to reference source files to be compiled.
| * | | | | | | cmNinjaTargetGenerator: Rename local variable for clarityBrad King2021-05-251-5/+5
| | | | | | | |
| * | | | | | | cmLocalNinjaGenerator: Remove unnecessary CollapseFullPath callBrad King2021-05-251-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ConvertToIncludeReference` is only called with absolute paths. One branch already assumed this.
generated by cgit v0.12 at 2025-01-10 09:36:57 (GMT)