summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | 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.
* | | | | | | | CMake Nightly Date StampKitware Robot2023-01-311-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'msvc-showIncludes'Brad King2023-01-3035-19/+153
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f82e755f3 Ninja: Fix detection of MSVC showIncludes prefix in Italian d6e7e4d4a1 Tests: Extend RunCMake.Ninja ShowIncludes cases to cover more languages 9596305c0b Tests: Generalize RunCMake.Ninja ShowIncludes test infrastructure c6dd4fa21d Tests: Extend RunCMake.Ninja ShowIncludes case with sample path a9d97492fd Ninja: Record showIncludes detection in configure log Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8129
| * | | | | | | Ninja: Fix detection of MSVC showIncludes prefix in ItalianBrad King2023-01-286-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prefix does not have two colons. Update our regex. Fixes: #24357
| * | | | | | | Tests: Extend RunCMake.Ninja ShowIncludes cases to cover more languagesBrad King2023-01-2821-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cases for English, French, German, and Japanese.
| * | | | | | | Tests: Generalize RunCMake.Ninja ShowIncludes test infrastructureBrad King2023-01-2810-15/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare to add support for more languages.
| * | | | | | | Tests: Extend RunCMake.Ninja ShowIncludes case with sample pathBrad King2023-01-275-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify that the prefix is separated from the path.
| * | | | | | | Ninja: Record showIncludes detection in configure logBrad King2023-01-271-0/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Also avoid running the detection multiple times.
* | | | | | | Merge topic 'iwyu-better-ci-logs'Brad King2023-01-303-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf3425c3d2 ci: add a comment to run IWYU in verbose mode 25f0b4f397 CMake: add an option to run IWYU in verbose mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8130
| * | | | | | | ci: add a comment to run IWYU in verbose modeBen Boeckel2023-01-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful to avoid setting up the CI locally to get a single extra message.
| * | | | | | | CMake: add an option to run IWYU in verbose modeBen Boeckel2023-01-272-1/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps to diagnose places where IWYU asks to include headers for internal stdlib details.
* | | | | | | Merge topic 'cxxmodules-export-iface-names-test'Brad King2023-01-3017-14/+251
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f755296f9d Tests/RunCMake/CXXModules: add tests which don't export C++ module properties Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8126
| * | | | | | | Tests/RunCMake/CXXModules: add tests which don't export C++ module propertiesBen Boeckel2023-01-2717-14/+251
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing `export-interfaces-{build,install}` tests were actually doing this, but make those test exporting the interfaces and copy the existing tests to tests which explicitly test the "no properties" condition.
* | | | | | | Merge topic 'FindImageMagick'Brad King2023-01-309-40/+122
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bba218214 FindImageMagick: Define targets for specific components Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !8098
| * | | | | | FindImageMagick: Define targets for specific componentshstejas2023-01-279-40/+122
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - With this change we can use e.g. ImageMagick::Magick++ directly in targt_link_libraries. - This change also adds CFLAGS which was missing before. - Also adds example on how to use the targets.
* | | | | | CMake Nightly Date StampKitware Robot2023-01-301-1/+1
| |_|_|/ / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2023-01-291-1/+1
| | | | |
* | | | | Merge topic 'ci-intel-compiler'Brad King2023-01-281-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e671692d9c gitlab-ci: add jobs testing Intel 2023.0.0 compilers on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8132
| * | | | | gitlab-ci: add jobs testing Intel 2023.0.0 compilers on LinuxBrad King2023-01-271-0/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | Note that the classic compiler version is 2021.8.0, but we still have it in the 2023.0.0 base image.
* | | | | CMake Nightly Date StampKitware Robot2023-01-281-1/+1
|/ / / /
* | | | Merge topic 'ci-imagemagick'Brad King2023-01-274-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85f16fe913 ci: add ImageMagick to Debian and Fedora base images Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8124
| * | | | ci: add ImageMagick to Debian and Fedora base imagesBrad King2023-01-264-3/+6
| | | | |
* | | | | Merge topic 'vs-asm-flags'Brad King2023-01-277-12/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24bcad5bac VS: Honor compile options for ASM_NASM b44714a642 VS: Honor compile options for ASM_MARMASM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8125
| * | | | | VS: Honor compile options for ASM_NASMBrad King2023-01-264-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja and Makefile generators honor `target_compile_options` and friends for ASM_NASM `.asm` sources. Teach the VS generator to honor them too for consistency. Issue: #24289
| * | | | | VS: Honor compile options for ASM_MARMASMBrad King2023-01-264-10/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja and Makefile generators honor `target_compile_options` and friends for ASM_MARMMASM `.asm` sources. Teach the VS generator to honor them too for consistency. Issue: #24289
* | | | | Merge topic 'jmalak-master-patch-responsefile'Brad King2023-01-273-6/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6bdf54a5e Watcom: Fix double-quote to be single-quote in response files for wlink Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8119
| * | | | | Watcom: Fix double-quote to be single-quote in response files for wlinkJiri Malak2023-01-263-6/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | Response files contained double-quote for any response file, but response files for wlink must contains single-quote. This is fix for libraries list response file. Problem for object file list was fixed by MR !8115
* | | | | CMake Nightly Date StampKitware Robot2023-01-271-1/+1
|/ / / /
* | | | Merge topic 'configure_file_docs_use_target_inc_dirs'Brad King2023-01-261-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c89d467bf2 Help: configure_file doc example use `target_include_directories` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8121
| * | | | Help: configure_file doc example use `target_include_directories`Robert Maynard2023-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | Fixes #24351
* | | | | Merge topic 'xcode-swift-inherited-flags'Brad King2023-01-265-2/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01c1d81527 Xcode: Inherit Swift flags and compilation conditions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8122
| * | | | | Xcode: Inherit Swift flags and compilation conditionsRoss Kilgariff2023-01-255-2/+35
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the change from commit dfaf55fbfd (Xcode: add extra '$(inherited)' entries using InheritBuildSettingAttribute, 2021-05-03, v3.21.0-rc1~182^2) to cover Swift flags and compilation conditions, allowing CocoaPods and CMake to interoperate when used in the same project.
* | | | | Merge topic 'watcom-win16'Brad King2023-01-265-33/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e194caa5a3 OpenWatcom: Add correct support for 16-bit Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8116
| * | | | | OpenWatcom: Add correct support for 16-bit WindowsJiri Malak2023-01-255-33/+61
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This add correct Open Watcom support for 16-bit Windows 3.x. It replace existing strange mixture with WIN32 stuff which implement 16-bit Windows target partially as part of WIN32 stuff. Now pre-defined OS ID Windows3x is used instead of confusing WIN32. It support properly 16-bit and 32-bit application for 16-bit Windows host. 32-bit applications are build with OW WIN386 extender. It is used similar as for other platforms by set CMAKE_SYSTEM_NAME=Windows3x and CMAKE_SYSTEM_PROCESSOR=I86 for 16-bit application or CMAKE_SYSTEM_PROCESSOR=x86 for 32-bit WIN386 extender application running on 16-bit Windows 3.x. CMAKE_SYSTEM_NAME=Windows is used only for WIN32 applications.
* | | | | Merge topic 'jmalak-master-patch-watcomquote'Brad King2023-01-265-26/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1d065e5c7 Watcom: Replace WATCOMQUOTE format by UseWatcomQuote attribute Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8115
| * | | | | Watcom: Replace WATCOMQUOTE format by UseWatcomQuote attributeJiri Malak2023-01-245-26/+21
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace WATCOMQUOTE output format by UseWatcomQuote attribute to properly handle single quote This attribute is used globaly only for Watcom linker to handle single-quote separator instead of double-quote it doesn't mean different output format only change of quoting separator It is now applied to any output form SHELL/RESPONSE/NINJAMULTI if Watcom linker is used otherwise double-quote is used
* | | | | Merge topic 'vs-BuildInParallel'Brad King2023-01-262-6/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8024c41685 VS: Do not concurrently build custom commands with generated MAIN_DEPENDENCY Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8120
| * | | | | VS: Do not concurrently build custom commands with generated MAIN_DEPENDENCYBrad King2023-01-252-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 33c15ae2b9 (VS: Build custom commands concurrently when possible, 2023-01-19) several tests have failed intermittently with the VS generator. It seems that if the `BuildInParallel` setting is attached to a generated input: <CustomBuild Include="generated_input.txt"> <BuildInParallel Condition="...">true</BuildInParallel> <Command Condition="...">copy geneated_input.txt output.txt</Command> ... </CustomBuild> then MSBuild does not wait for the input to be generated before running the command. This occurs when using `add_custom_command`'s `MAIN_DEPENDENCY`, so avoid using `BuildInParallel` in that case. Issue: #18405
* | | | | | CMake Nightly Date StampKitware Robot2023-01-261-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'CheckCompilerFlag-clang'Brad King2023-01-253-8/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b45a3d0ce CheckCompilerFlag: Match the Clang "argument unused" output for all languages Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8117
| * | | | | CheckCompilerFlag: Match the Clang "argument unused" output for all languagesKOLANICH2023-01-243-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve detection of missing compiler flags: move "argument unused during compilation: .*" pattern from language-specific branches into the common list.
generated by cgit v0.12 at 2025-09-05 15:53:43 (GMT)