summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'iface-public-modules' into release-3.31Brad King2024-12-1215-2/+56
|\ | | | | | | | | | | | | | | | | 854eba0c53 target_sources: Improve error message for CXX_MODULES on INTERFACE libraries cd179e7560 Tests/RunCMake/CXXModules: Rename FileSetModules cases to be more specific Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !10090
| * target_sources: Improve error message for CXX_MODULES on INTERFACE librariesBrad King2024-12-1110-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We support non-compiled `SOURCES` on `INTERFACE` libraries, and also support `CXX_MODULES` on *imported* `INTERFACE` libraries (via synthetic targets that compile module interface units). However, we do not support `CXX_MODULES` on non-imported `INTERFACE` libraries because there is no place to hold module interface unit's object files for their module initializers. Previously this was not explicitly rejected, and so was diagnosed only by "CMake Internal Error" messages due to assumption violations in the implementation. Fixes: #26524 Co-authored-by: Ben Boeckel <ben.boeckel@kitware.com>
| * Tests/RunCMake/CXXModules: Rename FileSetModules cases to be more specificBrad King2024-12-116-2/+7
| | | | | | | | They all add `CXX_MODULES` to `STATIC` libraries.
* | Ninja: Add missing top-level codegen dependencies on per-directory codegenBrad King2024-12-107-0/+56
| | | | | | | | | | | | | | | | | | In commit 197cb419d1 (add_custom_command: Add CODEGEN support, 2024-05-27, v3.31.0-rc1~394^2) we accidentally left out the global `codegen` target's dependencies on the per-directory `codegen` targets. Add them for parity with the `all` target. Fixes: #26517
* | Merge topic 'autogen-revert-ui-rebuild' into release-3.31Brad King2024-12-0515-294/+76
|\ \ | | | | | | | | | | | | | | | | | | | | | debc4d3906 Autogen: Revert adding ui files to byproducts of the timestamp target Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !10056
| * | Autogen: Revert adding ui files to byproducts of the timestamp targetOrkun Tokdemir2024-12-0415-294/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `ui_` include directives have different paths than `CMakeLists.txt`, the dependency graph is not generated correctly. This is the root cause of #16776. However, when #26135 was fixed by commit 5363bebc1e (Autogen: Fix compilation of unchanged source files, 2024-07-16, v3.31.0-rc1~328^2), it made #16776 worse: the build is always dirty. Revert the fix for now. Fixes: #26485 Issue: #26135 Issue: #25436
* | | LINK_OPTIONS: Fix crash on empty LINKER: prefixBrad King2024-12-041-0/+1
|/ / | | | | | | | | | | | | | | Since commit e3895f4a8b (Linking: Preserve nested LINKER: prefixes as written, 2024-09-17, v3.31.0-rc1~60^2) we may increment an iterator past the end. Revise logic to avoid that. Fixes: #26499
* | Autogen: Fix Ninja Multi-Config dependency graph regressionOrkun Tokdemir2024-11-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | In commit 5363bebc1e (Autogen: Fix compilation of unchanged source files, 2024-07-16, v3.31.0-rc1~328^2) we relied on Ninja Multi-Config dependency graph optimizations from commit 7c39dabdbc (Autogen: AUTO*_EXECUTABLE: add support for per-config values, 2023-10-18, v3.29.0-rc1~105^2~1). However, those graph optimizations are conditional on versions of Qt that enable [`AUTOGEN_BETTER_GRAPH_MULTI_CONFIG`](https://codereview.qt-project.org/c/qt/qtbase/+/513648). `UseBetterGraph` should be checked to add ui files to `timestampByproducts`. Fixes: #26475
* | AIX: Disallow TARGET_SONAME_* genex for AIX_SHARED_LIBRARY_ARCHIVE targetsBrad King2024-11-219-3/+44
| | | | | | | | | | AIX shared library archives have no filesystem artifact named with their SONAME because it is in an archive.
* | cmExperimental: Make CPS-export experimental notice more consistentMatthew Woehlke2024-11-191-2/+2
| | | | | | | | | | | | There is an inadvertent inconsistency in the notice for the CPS export experimental feature as compared to other experimental feature notices. Change it to be consistent.
* | LLD linker: avoid regression on archive libraries deduplicationMarc Chevrier2024-11-182-1/+12
| | | | | | | | | | | | | | Due to a bug on LLD linker for ELF binaries, deduplication should occur only if CMP0156 and CMP0179 are NEW. Fixes: #26447
* | CMP0175: Do not reject USES_TERMINAL for add_custom_command(TARGET)Craig Scott2024-11-153-4/+5
| | | | | | | | Fixes: #26449
* | Clarify advice given by compatibility deprecation message for CMake < 3.10Brad King2024-11-1428-60/+90
| | | | | | | | | | | | | | | | | | Since commit 84db8506ff (Deprecate compatibility with CMake versions older than 3.10, 2024-10-03, v3.31.0-rc1~23^2) the `cmake_minimum_required` and `cmake_policy` commands warn if the project does not enable policies as of 3.10 or higher. Clarify the advice given in the warning message about how to update the version specification, particularly without actually requiring a newer minimum version of CMake.
* | GoogleTest: Clear script content buffer on flush and flush less oftenCraig Scott2024-11-124-10/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to check if flushing is needed after every command is added to the variable holding the script content. It is enough to only check once per test name. This simplifies the flushing logic, removing the need for a separate flush_script() command. Previously, we were not clearing the flushed script contents in all cases, but this is now rigorously enforced at the one location where flushing is performed. Also simplify the flushing of the list of test names, since that too doesn't need a separate command. It is simpler and safer to handle that directly inline where the one call to flush_tests_buffer() was previously being made. Fixes: #26431
* | cmake_parse_arguments: Restore capture of value after repeated keywordCraig Scott2024-10-282-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a single-value keyword is repeated, and the first instance is missing a value, it prevents the value from the second instance from being stored in a variable. This was a regression introduced by commit ceeea4e511 (cmake_parse_arguments: Set variable if empty string given after keyword, 2024-08-18). That change also didn't create a variable if the keyword was given but without a value. The purpose of the change was to always define a variable if a keyword was given. Lastly, that change didn't protect the CMP0174 logic to make it only apply to the PARSE_ARGV form. The first two of the above problems are fixed here by tracking the keywords given instead of checking which keywords were missing values. The third problem is also fixed here, being tightly coupled to the same logic as the first two problems. Fixes: #26397
* | Merge topic 'link-strategy' into release-3.31Brad King2024-10-2823-12/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 39fd396421 LINK_LIBRARIES_STRATEGY: Rename strategies to clarify expectations Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !9949
| * | LINK_LIBRARIES_STRATEGY: Rename strategies to clarify expectationsBrad King2024-10-2523-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 7abd3137b7 (Linking: Optionally reorder direct dependencies from LINK_LIBRARIES, 2024-09-19, v3.31.0-rc1~53^2) the strategy name `PRESERVE_ORDER` has led users to expect that it strictly preserves order. While the part of the link line generation logic controlled by `LINK_LIBRARIES_STRATEGY` does preserve order, it is not the last step. Toolchain-specific de-duplication can cause the order to change on the actual link line generated in the build system. Rename the strategies: * `PRESERVE_ORDER` => `REORDER_MINIMALLY` * `REORDER` => `REORDER_FREELY` The new names make it clear that reordering is always possible, just to varying degrees. Update the `LINK_LIBRARIES_STRATEGY` documentation to clarify that the strategies do not directly control the final link line. Fixes: #26400 Issue: #26271
* | | Tests/RunCMake/BuildDepends: Skip LinkDepends with broken GNU ld 2.43Brad King2024-10-262-4/+10
| | | | | | | | | | | | Issue: #26401
* | | Tests: Fix FILE stream leaks in helper programsBrad King2024-10-262-7/+11
| | |
* | | codespell: Fix typosBrad King2024-10-255-7/+7
|/ /
* | Merge topic 'windows-kernel-mode-driver' into release-3.31Brad King2024-10-251-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | 54bbd00448 WindowsKernelModeDriver: Switch to appending to variables Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9941
| * | WindowsKernelModeDriver: Switch to appending to variablesJoseph Snyder2024-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When using the WindowsKernelModeDriver, do not add the new paths if the variable was not previously defined. Instead, append them to the existing value. Add a new GUID for the Experimental mode gate
* | | LFortran: Improve detection of implicit link information for lfortran 0.40+Brad King2024-10-245-0/+91
|/ / | | | | | | | | | | | | These versions of LFortran support passing `-v -Wl,-v` to the underlying compiler so we can extract the full implicit link information. Issue: #26145
* | cmExportPackageInfoGenerator: Fix version propertiesMatthew Woehlke2024-10-173-0/+41
| | | | | | | | | | | | | | | | Fix a small bug in cmExportPackageInfoGenerator that caused extended version properties ("compat_version", "version_schema")) to be emitted when empty. Add a test to ensure this is working as intended. Fixes: #26264
* | Revert "Ensure imported targets in sibling dirs are deduplicated"Brad King2024-10-163-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Revert commit 502610733f (Ensure imported targets in sibling dirs are deduplicated, 2024-09-15, v3.31.0-rc1~92^2). Also revert the change from a copy of the logic made by commit cd418d4bb6 (Static libraries de-duplication: keep first occurrence, 2024-09-29, v3.31.0-rc1~30^2). The logic was de-duplicating based on the target name rather than based on the library file path. Fixes: #26371 Issue: #26284
* | Tests/RunCMake/CMP0156: Match expected results more preciselyBrad King2024-10-162-2/+2
| |
* | project: Always set <PROJECT-NAME>_* as normal variablesCraig Scott2024-10-0810-11/+56
| | | | | | | | | | | | | | | | | | | | Re-introduce the behavior originally introduced in CMake 3.30.3 by commit c1ece78d11 (project: non cache <project> prefix variables are also created, 2024-08-27, v3.30.3~2^2), but this time with a policy for compatibility. Issue: #25714 Issue: #26243
* | Merge topic 'project-vars'Brad King2024-10-081-1/+6
|\ \ | |/ | | | | | | | | | | | | fa07ddfebf project: Only check non-cache vars when setting project vars Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !9883
| * project: Only check non-cache vars when setting project varsCraig Scott2024-10-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit 86ad7cc886 (project: Only define non-cache vars if already defined, 2024-09-15, v3.30.4~2^2) was meant to only check for non-cache variables when deciding whether to set non-cache project variables for the current call. However, it erroneously checked for any variable, including cache variables. This gives the intended result on the first run, but on subsequent runs a cache variable will exist that did not on the first run, leading to different behavior between the two runs. Fix the logic to only check for a pre-existing non-cache variable, as was originally intended. Fixes: #26355
* | Merge topic 'cmake--workflow-preset'Brad King2024-10-075-2/+58
|\ \ | | | | | | | | | | | | | | | | | | | | | b80aa1d3a3 preset: Easier command line interface for Workflow Presets Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !9866
| * | preset: Easier command line interface for Workflow PresetsKevin Tolle2024-10-055-2/+58
| | | | | | | | | | | | | | | | | | | | | A positional option allows 'cmake --workflow --preset <preset>' to be shortened to 'cmake --workflow <preset>'. Fixes: #26270
* | | Merge topic 'GoogleTest-DISCOVERY_EXTRA_ARGS'Brad King2024-10-074-0/+70
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 2dcba446e2 GoogleTest: Add DISCOVERY_EXTRA_ARGS to gtest_discover_tests() f55f9fd5c1 Help: Mention TEST_LIST with gtest_discover_tests() can omit tests Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !9856
| * | GoogleTest: Add DISCOVERY_EXTRA_ARGS to gtest_discover_tests()Cedric Martineau2024-10-044-0/+70
| | | | | | | | | | | | | | | Fixes: #26261 Co-authored-by: Craig Scott <craig.scott@crascit.com>
* | | Deprecate compatibility with CMake versions older than 3.10Brad King2024-10-0332-35/+65
| | | | | | | | | | | | | | | | | | | | | | | | Issue a deprecation warning on calls to `cmake_minimum_required` or `cmake_policy` that set policies based on versions older than 3.10. Note that the effective policy version includes `...<max>` treatment. Update the check from commit 3a4791548d (Deprecate compatibility with CMake versions older than 3.5, 2023-02-09, v3.27.0-rc1~508^2).
* | | Tests/RunCMake: Update cmake_minimum_required versions to 3.10Brad King2024-10-03190-189/+237
| | | | | | | | | | | | | | | For policy-specific tests, use the version before the policy was introduced. Otherwise, use 3.10 where possible.
* | | Tests/RunCMake: Match diagnostic line numbers more robustlyBrad King2024-10-0352-78/+78
| | |
* | | Static libraries de-duplication: keep first occurrenceMarc Chevrier2024-10-022-19/+23
| | | | | | | | | | | | Fixes: #26335
* | | Tests/RunCMake/LinkLibrariesStrategy: Check ordering results more stronglyBrad King2024-10-0211-2/+62
|/ /
* | Merge topic 'preserve-empty-args-test-command-lines'Brad King2024-10-0211-29/+171
|\ \ | | | | | | | | | | | | | | | | | | | | | fc7aa3cd69 tests: Preserve empty arguments in test command lines 9f1703530b Help: Add pre-test to prose for gtest_discover_tests() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9575
| * | tests: Preserve empty arguments in test command linesCraig Scott2024-10-0211-29/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will now preserve empty values in the TEST_LAUNCHER and CROSSCOMPILING_EMULATOR target properties for tests added by: - The add_test() command. - The ExternalData_Add_Test() command from the ExternalData module. - The gtest_add_tests() or gtest_discover_tests() commands from the GoogleTest module. For the gtest_add_tests() and gtest_discover_tests() commands, empty elements in the values passed after the EXTRA_ARGS keyword are also now preserved. Policy CMP0178 is added to provide backward compatibility with the old behavior where empty values were silently discarded from the above cases. Fixes: #26337
* | | VS: Honor VS_TOOL_OVERRIDE for known source file types tooDarragh Coy2024-10-015-0/+74
|/ / | | | | | | | | | | | | | | | | | | Visual Studio Generator: The `VS_TOOL_OVERRIDE` source file property would previously only be respected for file types that CMake didn't know how to build out of the box. This change allows the user to override how any source file is built with a custom build tool, even ones with standard/recognized extensions such as `.cxx`, `.idl`, etc. Fixes: #26336
* | Merge topic 'curl-tls-version'Brad King2024-09-274-8/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 38390245a2 ctest: Require minimum TLS 1.2 by default 5e1a59dc2b file(DOWNLOAD/UPLOAD): Require minimum TLS 1.2 by default Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9848
| * | file(DOWNLOAD/UPLOAD): Require minimum TLS 1.2 by defaultBrad King2024-09-264-8/+7
| | | | | | | | | | | | Fixes: #25701
* | | Merge topic 'link-strategy'Brad King2024-09-2627-0/+177
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7abd3137b7 Linking: Optionally reorder direct dependencies from LINK_LIBRARIES 9285a9dc9a cmComputeLinkDepends: Add final dependency ordering to debug output f792db4ca2 cmComputeLinkDepends: Add undocumented per-target debug property 80b469a51d cmComputeLinkDepends: Factor out string literals as named constants 3bd73fcc76 cmComputeLinkDepends: Modernize member initialization 8db69c767b cmComputeLinkDepends: Remove redundant member dccdd030cd cmComputeLinkDepends: Replace depender index sentinel value with cm::optional 6c9d8dc243 cmComputeLinkDepends: Replace group index sentinel value with cm::optional ... Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !9835
| * | | Linking: Optionally reorder direct dependencies from LINK_LIBRARIESBrad King2024-09-2527-0/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Traditionally CMake generates link lines by starting with the direct link dependencies specified by `LINK_LIBRARIES` in their original order and then appending indirect dependencies that the direct dependencies do not express. This gives projects control over ordering among independent entries, which can be important when intermixing flags and libraries, or when multiple libraries provide the same symbol. However, it may also result in inefficient link lines. Add support for an alternative strategy that can reorder direct link dependencies to produce more efficient link lines. This is useful for projects that cannot easily specify their targets' direct dependencies in an order that satisfies indirect dependencies. Add a `CMAKE_LINK_LIBRARIES_STRATEGY` variable and corresponding `LINK_LIBRARIES_STRATEGY` target property to select a strategy. Fixes: #26271
* | | | VS: Fix missing <Configurations> property for DOTNET_SDKCalum Robinson2024-09-253-0/+32
| |/ / |/| | | | | | | | Fixes #26325
* | | Merge topic 'curl-tls-version'Brad King2024-09-259-11/+87
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d2ea8371d Tests/RunCMake/file-DOWNLOAD: Add case covering TLS_VERSION values c864ffceb7 Tests/RunCMake/file-DOWNLOAD: Clarify name of invalid TLS_VERSION case Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9845
| * | | Tests/RunCMake/file-DOWNLOAD: Add case covering TLS_VERSION valuesBrad King2024-09-246-0/+76
| | | |
| * | | Tests/RunCMake/file-DOWNLOAD: Clarify name of invalid TLS_VERSION caseBrad King2024-09-244-4/+4
| | | | | | | | | | | | | | | | | | | | The test case is about an invalid version specification, not a TLS version unsupported by the server.
* | | | Merge topic 'nested_linker_prefixes'Brad King2024-09-257-18/+46
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3895f4a8b Linking: Preserve nested LINKER: prefixes as written 4185dfbe1b Tests/LINK_OPTIONS: extract common code in test (NFC) 54381b5a81 Linking: extract wrapping linker options to a lambda (NFC) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9823