summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-ipo'Brad King2023-02-014-9/+10
|\ | | | | | | | | | | | | | | d7c60ab6b0 Help: mark the directory properties INTERPROCEDURAL_OPTIMIZATION as deprecated 6ed026592e Help: improve docs for INTERPROCEDURAL_OPTIMIZATION target property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8141
| * Help: mark the directory properties INTERPROCEDURAL_OPTIMIZATION as deprecatedAlexander Neundorf2023-01-313-9/+6
| | | | | | | | | | These properties actually never existed, so move the documentation to "Deprecated" and refer to the target properties.
| * Help: improve docs for INTERPROCEDURAL_OPTIMIZATION target propertyAlexander Neundorf2023-01-311-0/+4
| | | | | | | | | | | | The documentation now mentions the per-config target property. Fixes: #24285
* | Merge topic '_hm_swift_threads_pthread'Brad King2023-02-011-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | d7963aa9ee FindThreads: Filter -pthread out for compatibility with Swift linker Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8142
| * | FindThreads: Filter -pthread out for compatibility with Swift linkerHarry Mallon2023-01-311-1/+1
| | |
* | | Merge topic 'cmTarget-refactorings'Brad King2023-02-011-389/+335
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33f629184f cmTarget: simplify `CheckLinkLibraryPattern` 22b9ce73e7 cmTarget: refactor INTERFACE_LINK_LIBRARIES_DIRECT_EXCLUDE usage requirements 332d2f8f52 cmTarget: refactor INTERFACE_LINK_LIBRARIES_DIRECT usage requirements 15eec07500 cmTarget: refactor INTERFACE_LINK_LIBRARIES usage requirements e80689d101 cmTarget: refactor LINK_LIBRARIES usage requirements 4f009d2121 cmTarget: refactor LINK_DIRECTORIES usage requirements 99e783e735 cmTarget: refactor LINK_OPTIONS usage requirements fd295dd263 cmTarget: refactor SOURCES usage requirements ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8127
| * | | cmTarget: simplify `CheckLinkLibraryPattern`Ben Boeckel2023-01-311-13/+8
| | | | | | | | | | | | | | | | | | | | Now that usage properties have more of a representation, the function can just take the requirement directly.
| * | | cmTarget: refactor INTERFACE_LINK_LIBRARIES_DIRECT_EXCLUDE usage requirementsBen Boeckel2023-01-311-27/+9
| | | |
| * | | cmTarget: refactor INTERFACE_LINK_LIBRARIES_DIRECT usage requirementsBen Boeckel2023-01-311-42/+42
| | | |
| * | | cmTarget: refactor INTERFACE_LINK_LIBRARIES usage requirementsBen Boeckel2023-01-311-28/+9
| | | |
| * | | cmTarget: refactor LINK_LIBRARIES usage requirementsBen Boeckel2023-01-311-25/+9
| | | |
| * | | cmTarget: refactor LINK_DIRECTORIES usage requirementsBen Boeckel2023-01-311-35/+14
| | | |
| * | | cmTarget: refactor LINK_OPTIONS usage requirementsBen Boeckel2023-01-311-31/+14
| | | |
| * | | cmTarget: refactor SOURCES usage requirementsBen Boeckel2023-01-311-32/+19
| | | |
| * | | cmTarget: refactor PRECOMPILE_HEADERS usage requirementsBen Boeckel2023-01-311-43/+23
| | | |
| * | | cmTarget: refactor COMPILE_DEFINITIONS usage requirementsBen Boeckel2023-01-311-25/+10
| | | |
| * | | cmTarget: refactor COMPILE_FEATURES usage requirementsBen Boeckel2023-01-311-25/+9
| | | |
| * | | cmTarget: refactor COMPILE_OPTIONS usage requirementsBen Boeckel2023-01-311-30/+14
| | | |
| * | | cmTarget: refactor INCLUDE_DIRECTORIES usage requirementsBen Boeckel2023-01-311-31/+47
| | | |
| * | | cmTarget: introduce a `UsageRequirementProperty` structureBen Boeckel2023-01-311-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | This structure will encapsulate the behaviors of usage requirements. There are a number of them now and they all behave very similarly, so try to reduce the code duplication as much as possible.
| * | | cmTarget: use cmNonempty rather than local implementationBen Boeckel2023-01-271-22/+2
| | | |
| * | | cmTarget: use an enum for the action when writing fileset propertiesBen Boeckel2023-01-271-18/+35
| | | |
| * | | cmTarget: simplify fileset type property managementBen Boeckel2023-01-271-34/+38
| | | | | | | | | | | | | | | | | | | | Instead of copy/pasting conditionals for each fileset type, just make an array of the structures and iterate over them.
* | | | Merge topic 'cmTarget-property-grouping'Brad King2023-02-011-90/+149
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7c29f3ebd cmTarget: use static string views for per-config properties 47315d817c cmTarget: group remaining properties 32d21f215f cmTarget: put build graph-related properties into a group 6f9821d179 cmTarget: put static analysis (co-compile) properties in a group ead9ff61f9 cmTarget: put linking-related properties in a group 9bb824a237 cmTarget: put compile-related properties in a group Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8135
| * | | | cmTarget: use static string views for per-config propertiesBen Boeckel2023-01-301-6/+5
| | | | |
| * | | | cmTarget: group remaining propertiesBen Boeckel2023-01-301-1/+8
| | | | | | | | | | | | | | | | | | | | These are kind of a mixed assortment.
| * | | | cmTarget: put build graph-related properties into a groupBen Boeckel2023-01-301-15/+23
| | | | |
| * | | | cmTarget: put static analysis (co-compile) properties in a groupBen Boeckel2023-01-301-15/+22
| | | | |
| * | | | cmTarget: put linking-related properties in a groupBen Boeckel2023-01-301-27/+43
| | | | |
| * | | | cmTarget: put compile-related properties in a groupBen Boeckel2023-01-301-44/+66
| | | | |
* | | | | Merge topic 'ccg-index-type'Brad King2023-02-018-184/+212
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91a26ce041 cmComputeComponentGraph: use `size_t` for component indices 65c0a64dc5 cmComputeComponentGraph: use a name for "invalid component" 50abdaab93 IWYU: exclude `__decay_and_strip<int>` as well Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8128
| * | | | | cmComputeComponentGraph: use `size_t` for component indicesBen Boeckel2023-01-317-176/+191
| | | | | | | | | | | | | | | | | | | | | | | | This avoids using casts everywhere when dealing with the sizes.
| * | | | | cmComputeComponentGraph: use a name for "invalid component"Ben Boeckel2023-01-315-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | This is to prepare for making the graph use `size_t`.
| * | | | | IWYU: exclude `__decay_and_strip<int>` as wellBen Boeckel2023-01-271-0/+1
| | |/ / / | |/| | |
* | | | | CMake Nightly Date StampKitware Robot2023-02-011-1/+1
| | | | |
* | | | | Merge topic 'doc-CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS'Brad King2023-01-312-3/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c57f7b45e Help: Clarify CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !8136
| * | | | | Help: Clarify CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS behaviorRobert Maynard2023-01-302-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #24373
* | | | | | Merge topic 'doc-add_custom_command'Brad King2023-01-311-3/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abddcd370f Help: Clarify add_custom_command OUTPUT relative path behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8137
| * | | | | | Help: Clarify add_custom_command OUTPUT relative path behaviorBrad King2023-01-301-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #24372
* | | | | | | Merge topic 'CMakePackageConfigHelpers-ARCH_INDEPENDENT'Brad King2023-01-315-68/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77982de955 CMakePackageConfigHelpers: only emit arch check if needed Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8133
| * | | | | | | CMakePackageConfigHelpers: only emit arch check if neededAndrea Pappacoda2023-01-295-68/+19
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this patch, the write_basic_package_version_file() function of the CMakePackageConfigHelpers module always emitted an architecture check, even if the ARCH_INDEPENDENT option was specified. While this is not an issue when configuring builds, as the check is skipped, this can create issues when the "arch independent" version files are installed in the datadir (e.g. /usr/share) in a MultiArch environment like Debian, where different architecture packages of the same libraries can be coinstalled; as the amd64 version of a given library contains "8 * 8" in the file, while the i386 one contains "4 * 8", there's a conflict, as files in /usr/share are expected to be identical across architectures. This patch fixes this issue by only emitting the architecture check code if needed; when ARCH_INDEPENDENT is specified, no code is written at all. Here's a diff between the version files generated before and after this patch: diff -u old/indep.cmake new/indep.cmake --- old/indep.cmake 2023-01-29 13:43:04.840671117 +0100 +++ new/indep.cmake 2023-01-29 13:57:28.475191551 +0100 @@ -52,19 +52,3 @@ endif() -# if the installed project requested no architecture check, don't perform the check -if("TRUE") - return() -endif() - -# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it: -if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "") - return() -endif() - -# check that the installed version has the same 32/64bit-ness as the one which is currently searching: -if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8") - math(EXPR installedBits "8 * 8") - set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)") - set(PACKAGE_VERSION_UNSUITABLE TRUE) -endif() diff -u old/no-indep.cmake new/no-indep.cmake --- old/no-indep.cmake 2023-01-29 13:42:05.010710508 +0100 +++ new/no-indep.cmake 2023-01-29 13:57:40.914237219 +0100 @@ -52,13 +52,8 @@ endif() -# if the installed project requested no architecture check, don't perform the check -if("FALSE") - return() -endif() - # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it: -if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "") +if(CMAKE_SIZEOF_VOID_P STREQUAL "" OR "8" STREQUAL "") return() endif() Fixes: #24375
* | | | | | | Merge topic 'iwyu-ci-choose-target'Brad King2023-01-311-1/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5ee82104f ci: support debugging IWYU in CI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8138
| * | | | | | | ci: support debugging IWYU in CIBen Boeckel2023-01-301-1/+29
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of requiring setting up a mock CI environment with the official image locally. While such docs would be handy anyways, requiring that entire setup to get a small piece of information from a build is unnecessary.
* | | | | | | Merge topic 'update-curl'Brad King2023-01-31146-6003/+8231
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8443dfa946 curl: Work around missing OpenSSL symbol on machine with LCC 1.23 f9f5957884 Merge branch 'upstream-curl' into update-curl dac458ddbf curl 2022-12-21 (c12fb3dd) 39dcf9469d curl: Update script to get curl 7.87.0 b2fe717a49 file: Avoid using deprecated curl progress callback 1cd38de47f ctest: Drop unnecessary use of deprecated CURLOPT_PUT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8131
| * | | | | | curl: Work around missing OpenSSL symbol on machine with LCC 1.23Brad King2023-01-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a nightly build using LCC 1.23, OpenSSL 2.0.0 is found but does not seem to have the `X509_STORE_up_ref` symbol used by curl 7.87. Pending further investigation, disable use of the symbol based on the compiler version.
| * | | | | | Merge branch 'upstream-curl' into update-curlBrad King2023-01-27141-5989/+8202
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2022-12-21 (c12fb3dd)
| | * | | | | | curl 2022-12-21 (c12fb3dd)Curl Upstream2023-01-27141-5989/+8200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit c12fb3ddaf48e709a7a4deaa55ec485e4df163ee (curl-7_87_0).
| * | | | | | | curl: Update script to get curl 7.87.0Brad King2023-01-271-1/+1
| | | | | | | |
| * | | | | | | file: Avoid using deprecated curl progress callbackBrad King2023-01-272-9/+22
| | | | | | | |
| * | | | | | | ctest: Drop unnecessary use of deprecated CURLOPT_PUTBrad King2023-01-272-4/+0
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | All usage sites are already preceded by use of its replacement, CURLOPT_UPLOAD.