summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | CMake 3.20.3v3.20.3Brad King2021-05-271-1/+1
| | | | |
* | | | | 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.
| * | | | Ninja/Swift: Remove redundant calls to ConvertToNinjaPathBrad King2021-05-252-7/+4
| | | | | | | | | | | | | | | | | | | | `GetSourceFilePath` already handles converting to a Ninja path.
* | | | | Merge topic 'compiler-ti-linker-response-file'Brad King2021-05-261-5/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74a2a7a477 Compiler/TI: Restore response file usage for linker Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6159
| * | | | | Compiler/TI: Restore response file usage for linkerJosef Angstenberger2021-05-251-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit 98fea8205e (Compiler/TI: Avoid response file usage for linker, 2020-07-11, v3.19.0-rc1~495^2) disabled linker file usage by default. The previous settings were working, even if not for all cases. Restore them and add an explanation in a comment. Issue: #22233
* | | | | | CMake Nightly Date StampKitware Robot2021-05-261-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'update-expat'Brad King2021-05-2522-155/+1407
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49693fab0d cmexpat: Create expat_config.h in build within CMake itself bea145eb25 Merge branch 'upstream-expat' into update-expat 2da34f062a expat 2021-05-23 (a28238bd) 0ac6af4457 expat: Update script to get Expat 2.4.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6157
| * | | | | cmexpat: Create expat_config.h in build within CMake itselfBrad King2021-05-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Expat 2.4.1 no longer supports compiling without this header.
| * | | | | Merge branch 'upstream-expat' into update-expatBrad King2021-05-2420-154/+1404
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-expat: expat 2021-05-23 (a28238bd)
| | * | | | | expat 2021-05-23 (a28238bd)Expat Upstream2021-05-2420-163/+1405
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit a28238bdeebc087071777001245df1876a11f5ee (R_2_4_1).
| * | | | | | expat: Update script to get Expat 2.4.1Brad King2021-05-241-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'cpack-wix-text'Brad King2021-05-251-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a50db66bbd CPack/WIX: Use language en-US, font Consolas, size 14 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6155
| * | | | | | CPack/WIX: Use language en-US, font Consolas, size 14Jason Erb2021-05-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve rendering of text from `CPACK_RESOURCE_FILE_LICENSE`. Fixes: #22228
* | | | | | | Merge topic 'find_cuda_deprecation'Brad King2021-05-251-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15fda9384a FindCUDA: Improve deprecation guidance wording e16b06f4b9 FindCUDA: Make the deprecation notice more prominent Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6153
| * | | | | | | FindCUDA: Improve deprecation guidance wordingRaul Tambre2021-05-221-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplified the text regarding adding sources to be more general as there's also target_sources(). Improved the wording for FindCUDAToolkit to be more explicit of its usecase and avoid using "superseded" since the common usecase of FindCUDA was superseded by the language support. Wording suggestions incopropated from discussion on #22203.
| * | | | | | | FindCUDA: Make the deprecation notice more prominentRaul Tambre2021-05-221-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindCUDA is still widely used, but has been superseded by the much more robust native language support. However the deprecation hasn't been noticed well enough and real-world experience shows there's still new code written to use it. Change this particular notice to a warning to get a hard to miss red box. We lose the semantic meaning, but we don't want to make all notices like this. If there are similar cases in the future requiring it would be worth adding a custom variant of the deprecated directive. Fixes #22203.
* | | | | | | Merge topic 'FindVulkan-add-Headers-glslangValidator-targets'Brad King2021-05-255-7/+147
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 668ba68a7a FindVulkan: add Vulkan::Headers and Vulkan::glslangValidator targets Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6154
| * | | | | | | FindVulkan: add Vulkan::Headers and Vulkan::glslangValidator targetsPCJohn2021-05-245-7/+147
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Vulkan::Headers` target complements existing Vulkan::Vulkan target. It is the same except it omits the Vulkan library which supports applications that loads the Vulkan library in at runtime. The `Vulkan::glslangValidator` target provides the glslangValidator executable which is the tool for converting between shader languages (GLSL, SPIR-V, etc.).
generated by cgit v0.12 at 2025-02-15 12:04:01 (GMT)