summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
Commit message (Collapse)AuthorAgeFilesLines
* Trace: include `line_end` field in json-v1 formatBraulio Valdivielso Martinez2022-02-092-11/+32
| | | | | | | | | | | | | | | | | | | | After !6954 got merged, it has become easier for tools to get full stack-traces for runtime traces of a CMake program. The trace information already included in the JSON objects (line number, source file path) allows tools that display these stack traces to print the CMake source code associated to them. However, CMake commands may spawn multiple lines, and the JSON information associated to a trace only contains the line in which the command started, but not the one in which it ended. If tools want to print stack traces along the relevant source code, and they want to print the whole command associated to the stack frame, they will have to implement their own CMake language parser to know where the command ends. In order to simplify the life of those who want to write tooling for CMake, this commit adds a `line_end` field to the json-v1 trace format. If a given command spans multiple lines, the `line_end` field will contain the line of the last line spanned by the command (that of the closing parenthesis associated to the command).
* Merge topic 'genex-LINK_LIBRARY-to-decorate-library'Brad King2022-02-09127-0/+935
|\ | | | | | | | | | | | | | | | | | | | | 2a6b0415d7 $<LINK_LIBRARY>: Add LINK_LIBRARY_OVERRIDE target property 42965799b4 Genex: Add $<LINK_LIBRARY:...> 78dd7d5292 cmRulePlaceholderExpander: add base class for placeholder expansion reuse 4b55828a9f cmExpandListWithBacktrace: add handling of empty elements. 28d7432468 cmComputeLinkInformation: use cmComputeLinkDepends::LinkEntry Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6769
| * $<LINK_LIBRARY>: Add LINK_LIBRARY_OVERRIDE target propertyMarc Chevrier2022-02-0828-6/+152
| | | | | | | | | | | | To enable the management of incompatible $<LINK_LIBRARY> declarations, add LINK_LIBRARY_OVERRIDE and LINK_LIBRARY_OVERRIDE_<LIBRARY> target properties.
| * Genex: Add $<LINK_LIBRARY:...>Marc Chevrier2022-02-07106-0/+789
| | | | | | | | | | | | | | | | This generator expression offers the capability, for the link step, to decorate libraries with prefix/suffix flags and/or adding any specific flag for each library. Fixes: #22812, #18751, #20078, #22703
* | Merge topic 'trace-global-frame'Brad King2022-02-094-6/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | a41d6e4d7a Trace: add global_frame field to json-v1 format Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6954
| * | Trace: add global_frame field to json-v1 formatBraulio Valdivielso Martinez2022-02-074-6/+24
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tools using the json-v1 format might want to trace stack frames across different `CMakeLists.txt` files, in order to, for example, provide stacktraces that span from the top-level `CMakeLists.txt` in a project. One would think that `frame` lets you do that, but it doesn't, because it tells you the depth of the stack within the current `CMakeLists.txt`, so it gets reset across calls to `add_subdirectory`. The solution involves adding a field with a "global frame". This value gets incremented on calls to `add_subdirectory`, which makes it easier for tools to reconstruct "global stacktraces". I considered changing the current "frame" value, but I didn't because it would be a breaking change. I cannot think of any use-case where "frame" is more useful to "global-frame", but maybe I'm missing something.
* | Merge topic 'vs_buildcache_support'Brad King2022-02-093-0/+41
|\ \ | | | | | | | | | | | | | | | | | | b764c7c273 VS: Add property to turn off Visual Studio compile batching Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6957
| * | VS: Add property to turn off Visual Studio compile batchingKaloyan Donev2022-02-083-0/+41
| |/ | | | | | | Resolves: #23179
* | Merge topic 'GoogleTest-discover-type-params'Brad King2022-02-085-33/+47
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 073dd1bd81 GoogleTest: Change format for typed tests f28f738bd2 GoogleTest: Fix type param tests for suites with many cases Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6958
| * | GoogleTest: Change format for typed testsEvgeniy Shcherbina2022-02-074-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before it would output a typed test as follows: Suit/Type.Case And now it would be: Suit.Case<Type> In case of NO_PRETTY_TYPES it would simply use the type number instead of its text representation: Suit.Case<0> The change is introduced to make sure CTest outputs tests in a similar fashion which is "*Suit.Case*" and angle brackets "<>" emphasize that we are dealing with a typed (template) kind.
| * | GoogleTest: Fix type param tests for suites with many casesEvgeniy Shcherbina2022-02-075-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there were many cases (two digits or more) the "prettier" would fail to recognize the pretty part leaving the test name unprocessed. The fix made sure the processing would work correctly, irrespective of the case number. Before the fix, for the following input: TypedSuite/1. # TypeParam = int case TypedSuite/10. # TypeParam = char case The output would be: TypedSuite/int.case TypedSuite/10. # TypeParam = char.case Now the output will be: TypedSuite/int.case TypedSuite/char.case
| * | Merge topic 'GoogleTest-discover-spaces-in-parameters' into release-3.23Brad King2022-02-043-0/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | fd6b8fa40e GoogleTest: Preserve spaces in test parameters Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6941
| * \ \ Merge topic 'ci-minor-cleanups' into release-3.23Brad King2022-02-033-1/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 040c509bce gitlab-ci: clarify name of windows fragment for building with ninja bd14f07ce9 Tests: Skip Clang PCH_INSTANTIATE_TEMPLATES test in MSVC ABI c26b064b8c Tests: Suppress MSVC CRT deprecation warnings in pseudo_llvm-rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6947
* | \ \ \ Merge topic 'cmcmd-end-of-options-delimiter'Brad King2022-02-078-2/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b10930040d cmcmd: add end of options delimiter to cmake -E commands Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6934
| * | | | | cmcmd: add end of options delimiter to cmake -E commandsPeter Würth2022-02-038-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements a -- delimiter, that indicates the end of options (starting with a dash -) of a command and separates them from the subsequent operands (positional arguments). The following commands are affected: - env: Implemented the -- delimiter. - cat: The -- delimiter was already kind of considered, but its occurence did not stop the options parsing. - rm: Here the command already implemented the -- delimiter as specified, but it was not documented. Fixes #22970
* | | | | | Merge topic 'test-ctest_build-subdir-target'Brad King2022-02-072-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e485dca1e8 Tests: Move CTest.BuildCommand.ProjectInSubdir into RunCMake.ctest_build Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6953
| * | | | | | Tests: Move CTest.BuildCommand.ProjectInSubdir into RunCMake.ctest_buildBrad King2022-02-042-0/+16
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | The former duplicates code that is now part of the infrastructure in the latter. The latter can also explicitly verify the results.
* | | | | | Merge topic 'test-download-server-timeout'Brad King2022-02-072-1/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8809183d58 Tests: Optionally extend RunCMake.ExternalProject download server timeout Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6952
| * | | | | Tests: Optionally extend RunCMake.ExternalProject download server timeoutBrad King2022-02-042-1/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the `RunCMake.ExternalProject` test cases use a download server implemented in Python. Normally we wait up to 30 seconds for it to start. However, on some machines running many tests concurrently, the download server may take longer than that to start. Add an undocumented cache entry to use on those machines to extend the timeout.
* | | | | Merge topic 'post-rel-dev'Brad King2022-02-043-3/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a48012f93 Configure CMake itself with policies through CMake 3.22 a5a9687799 export: Increase maximum policy version in exported files to 3.22 a9ffded98c Add deprecation warnings for policies CMP0097 and below Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6948
| * | | | | Add deprecation warnings for policies CMP0097 and belowBrad King2022-02-033-3/+35
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OLD behaviors of all policies are deprecated, but only by documentation. Add an explicit deprecation diagnostic for policies introduced in CMake 3.16 and below to encourage projects to port away from setting policies to OLD.
* | | | | Merge topic 'ep-patch-USES_TERMINAL'Brad King2022-02-042-9/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbb87e0a2c ExternalProject: Add support for USES_TERMINAL_PATCH keyword Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6940
| * | | | | ExternalProject: Add support for USES_TERMINAL_PATCH keywordCraig Scott2022-02-032-9/+13
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings the patch step into line with all the others which already had their own `USES_TERMINAL_<step>` keyword. All steps (including patch) already have their own `LOG_<step>` keyword too, so the lack of `USES_TERMINAL_PATCH` was inconsistent.
* | | | | Merge topic 'GoogleTest-discover-spaces-in-parameters'Brad King2022-02-043-0/+9
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | fd6b8fa40e GoogleTest: Preserve spaces in test parameters Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6941
| * | | GoogleTest: Preserve spaces in test parametersEvgeniy Shcherbina2022-02-033-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the fix the gtest_discover_tests() function would strip the user data in test parameters (everything to the right of GetParam()) of spaces. Now the parameters aren't altered in any way. Fixes #23058
* | | | Merge topic 'ci-minor-cleanups'Brad King2022-02-033-1/+7
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | | | | | | 040c509bce gitlab-ci: clarify name of windows fragment for building with ninja bd14f07ce9 Tests: Skip Clang PCH_INSTANTIATE_TEMPLATES test in MSVC ABI c26b064b8c Tests: Suppress MSVC CRT deprecation warnings in pseudo_llvm-rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6947
| * | Tests: Skip Clang PCH_INSTANTIATE_TEMPLATES test in MSVC ABIBrad King2022-02-022-1/+3
| | |
| * | Tests: Suppress MSVC CRT deprecation warnings in pseudo_llvm-rcBrad King2022-02-021-0/+4
| |/
* | Merge topic 'cmake-ignore-prefix-path'Brad King2022-02-036-0/+60
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 201d8c4298 find_*(): Add CMAKE_IGNORE_PREFIX_PATH variable bd805a51ae Refactor: Keep track of prefixes in cmSearchPath Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6880
| * | find_*(): Add CMAKE_IGNORE_PREFIX_PATH variableKyle Edwards2022-02-026-0/+60
| |/ | | | | | | Fixes: #20878
* | CMakePresets.json: Ensure configurePreset is reachable from current fileKyle Edwards2022-02-0210-0/+43
|/
* Merge topic 'dotnet_ref_in_sdk'Brad King2022-02-021-1/+4
|\ | | | | | | | | | | | | 5ee3154f65 VS: .Net SDK Style projects can add Reference to dlls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6932
| * VS: .Net SDK Style projects can add Reference to dllsSumit Bhardwaj2022-02-011-1/+4
| | | | | | | | | | | | | | | | When support for `DOTNET_SDK` was added, only a minimal set of options were built in. Based on user feedback, support for reference to dlls (not just projects) is needed. That support is added here. Fixes: #23166
* | Merge topic 'ep-redownload-on-SOURCE_DIR-change'Brad King2022-02-024-5/+45
|\ \ | | | | | | | | | | | | | | | | | | d3477eba06 ExternalProject: Rerun download on SOURCE_DIR change Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6926
| * | ExternalProject: Rerun download on SOURCE_DIR changeCraig Scott2022-02-014-5/+45
| |/ | | | | Fixes: #21748
* | find_package(): Add tests for CMAKE_IGNORE_PATHKyle Edwards2022-01-312-0/+13
|/
* Merge topic 'ibmclang-compiler'Brad King2022-01-282-2/+2
|\ | | | | | | | | | | | | | | | | 8c1731546c Help: Add release note for IBM Open XL C/C++ compiler support 24da80b70a Utilities: Suppress warnings in third-party code with IBMClang 6da99e671c IBMClang: Add support for IBM Open XL C/C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6785
| * IBMClang: Add support for IBM Open XL C/C++Aaron Liu2022-01-272-2/+2
| | | | | | | | Fixes: #22929
* | Merge topic 'cuda_vs_arch_all'Brad King2022-01-289-0/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daf372c4d6 CUDA: Fix issuing error if default architecture detection fails 7a0d098352 CUDA: Error on empty/invalid CMAKE_CUDA_ARCHITECTURES set by user d19273bc7b CUDA: Support all and all-major on Visual Studio 5f667d783a CUDA: Actually use reverse architecture deprecation order for Clang Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !6912
| * | CUDA: Error on empty/invalid CMAKE_CUDA_ARCHITECTURES set by userRaul Tambre2022-01-279-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | If empty we otherwise treat it the same as unset in most places, but still end up failing eventually with a confusing "Failed to find a working CUDA architecture". This also detects some other basic invalid ones (e.g. "al").
* | | string(TIMESTAMP): add %f specifier for microsecondsPeter Würth2022-01-282-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The %f specified extends the string(TIMESTAMP) and file(TIMESTAMP) commands to output the timestamp with a microsecond resolution. This convention is offered by python's datetime module. Before, the precision was limited to seconds. The implementation is done by extending existing cmTimestamp methods with a `microseconds` parameter. This parameter is optional in order to be backwards compatible. The timestamps are now received in a cross-platform manner using libuv, since the standard C functions like time() don't allow for sub-second precision. This requires libuv 1.28 or higher. We already require higher than that on Windows, so update the required version for other platforms. Implements: #19335
* | Merge topic 'ep_test_with_build_with_server-arg-fix'Brad King2022-01-251-1/+1
|\ \ | |/ |/| | | | | | | | | 9406b2073e Tests: Remove stray argument from test invocation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6893
| * Tests: Remove stray argument from test invocationCraig Scott2022-01-241-1/+1
| | | | | | | | | | | | | | The run_cmake_with_options() command already sets the test command to ${CMAKE_COMMAND}. The options passed to that command shouldn't also add another ${CMAKE_COMMAND}. This removes a warning seen in the output of tests that invoke __ep_test_with_build_with_server().
* | Merge topic 'cmp0128_cuda'Brad King2022-01-2414-31/+46
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ee1396e29e CMP0128: Add flag in OLD mode even when standard matches the default b2c25de8e0 CMP0128: Avoid test code duplication 3a089cd256 CMP0128: Prefix test names with mode e13dd52535 XL: Detect default extensions mode for legacy compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6890
| * | CMP0128: Add flag in OLD mode even when standard matches the defaultRaul Tambre2022-01-233-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 4a0485be (cmStandardLevelResolver: Avoid unnecessary flags, fix unset level logic, 2021-04-29) unintentionally changed the behavior by modifying the code to match a pre-existing comment. The resulting behavior change however matches the intentions of CMP0128, so we simply need to guard it. Fixes #23122.
| * | CMP0128: Avoid test code duplicationRaul Tambre2022-01-237-26/+10
| | |
| * | CMP0128: Prefix test names with modeRaul Tambre2022-01-237-7/+7
| | | | | | | | | | | | Makes clear that these tests are for the NEW behaviour.
| * | Merge topic 'vs2022-v143-link-guard-cf' into release-3.22Brad King2022-01-133-0/+48
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 9e24437c91 VS: Remove the '/guard:cf' flag from v143 link flag table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6858
* | \ \ Merge topic 'vs-package-restore'Brad King2022-01-2420-2/+103
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9aa7831f05 Presets: add resolve packages setting to build presets. b2f8f0bb87 cmGlobalVisualStudio10Generator: Auto restore NuGet packages. 193b8fca52 cmBuildOptions: Split build arguments into separate object. 6a10103493 Help: Update preset schema description for version 3 entries. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6761
| * | | Presets: add resolve packages setting to build presets.Carsten Rudolph2022-01-222-2/+8
| | | |