summaryrefslogtreecommitdiffstats
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'nmc-target-objects' into release-3.21Brad King2021-07-237-17/+49
|\ | | | | | | | | | | | | | | cb777dd81e Ninja Multi-Config: Restore TARGET_OBJECTS support in cross-configs 83c8272280 cmGeneratorExpressionNode: Factor out local variable for global generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6371
| * Ninja Multi-Config: Restore TARGET_OBJECTS support in cross-configsBrad King2021-07-217-17/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2ae72ef74b (Xcode: Enable multi-arch TARGET_OBJECTS genex in [INTERFACE_]LINK_LIBRARIES, 2021-05-26, v3.21.0-rc1~126^2) the TARGET_OBJECTS genex, when referenced for linking, is now evaluated with EvaluateForBuildsystem enabled. This causes the object file paths to be computed with a buildsystem-specific placeholder for the configuration. This is normally fine because the placeholder will be evaluated by the native buildsystem tool using the proper configuration. However, the Ninja Multi-Config generator's `${CONFIGURATION}` placeholder may not have the correct value for cross-config object files. Switch back to using the per-config location of each object file for this generator. Fixes: #22436
* | Swift: Update test case to try CMP0126 NEW behaviorBrad King2021-07-211-0/+3
| | | | | | | | | | | | | | | | Extend the `SwiftOnly` test to cover the fix in commit 3ddd7f3576 (enable_language: Fix test for working compiler with CMP0126 NEW behavior, 2021-07-15), as that commit did for the `CSharpOnly` test. Fixes: #22451
* | Merge topic 'message-color' into release-3.21Brad King2021-07-214-0/+15
|\ \ | | | | | | | | | | | | | | | | | | c7a8c9c811 cmMessenger: Revert to non-color messages on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6369
| * | cmMessenger: Revert to non-color messages on WindowsBrad King2021-07-204-0/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0a0a0f8a74 (cmMessenger: Color messages to terminal by type, 2021-05-18, v3.21.0-rc1~146^2) the message output no longer goes through our custom streambuf on Windows that converts output encoding. This can cause messages to be printed with the wrong encoding in a Windows Console. It also causes messages to have a mix of LF and CRLF newlines because `stderr` converts LF to CRLF but our custom streambuf does not. Revert to using just `cerr` for messages on Windows. Another approach will be needed to achieve color output on Windows later. Fixes: #22444
* | Merge topic 'CMakeDependentOption-revert-parens' into release-3.21Brad King2021-07-214-8/+6
|\ \ | | | | | | | | | | | | | | | | | | d777ca12f6 CMakeDependentOption: Revert "Allow parentheses in the depends string" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6368
| * | CMakeDependentOption: Revert "Allow parentheses in the depends string"Brad King2021-07-204-8/+6
| |/ | | | | | | | | | | | | | | Revert commit 0665d9092e (CMakeDependentOption: Allow parentheses in the depends string, 2021-06-13, v3.21.0-rc1~32^2). It broke existing use cases with parentheses in regular expressions. Also add a test for this. Fixes: #22447
* | try_compile: Propagate CMP0126 to the generated test projectBrad King2021-07-2011-0/+22
|/ | | | | Set policy CMP0126 to the value used in the calling project. It may affect toolchain file behavior.
* Merge topic 'cmake-presets-no-binary-dir-no-s' into release-3.21Brad King2021-07-193-0/+18
|\ | | | | | | | | | | | | aa874dc609 CMakePresets.json: Fix expansion issue with empty binaryDir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6358
| * CMakePresets.json: Fix expansion issue with empty binaryDirKyle Edwards2021-07-163-0/+18
| | | | | | | | | | | | | | | | When resolving binaryDir into a full path from a relative path, we forgot to check if binaryDir is altogether empty, causing empty binaryDir's to resolve to the source directory. Fix this. Fixes: #22434
* | enable_language: Fix test for working compiler with CMP0126 NEW behaviorBrad King2021-07-151-0/+3
|/ | | | | | | | | | | | | | Update the logic that converts a `try_compile` result from a cache entry to a normal variable to tolerate an existing normal variable under CMP0126 NEW behavior. Otherwise the `try_compile` result is ignored because CMake uses the false value of the normal variable, and CMake incorrectly reports that the compiler does not work. This went unnoticed for some languages (e.g. C and CXX) because the check for a working compiler is skipped if ABI detection works. It does affect other languages (e.g. CSharp). Fixes: #22423
* Help: Clarify 'cmake --build' signature alternativesBrad King2021-07-1314-14/+14
| | | | | | | | | | | | | | | | Documentation added by * commit 4f4f2028b8 (Help: Add documentation for buildPresets and testPresets, 2021-01-13, v3.20.0-rc1~51^2~7) * commit 676ecf0d37 (cmake-presets: Add build and test presets, 2020-12-14, v3.20.0-rc1~51^2~6) used square brackets in the `cmake --build` signature to indicate non-optional alternatives, which is not a typical convention. A common convention is to use parentheses instead, but in this case it is probably clearer to list the two signatures separately. Fixes: #22413
* Merge topic 'file-grd-arch' into release-3.21Brad King2021-07-131-4/+1
|\ | | | | | | | | | | | | b2c03347b0 file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6339
| * file(GET_RUNTIME_DEPENDENCIES): Check architecture of dependenciesKyle Edwards2021-07-121-4/+1
| | | | | | | | Fixes: #22106
* | ci: Verify that Intel MKL is found when it is the only BLAS/LAPACKBrad King2021-07-124-6/+28
|/ | | | Issue: #22403
* Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC modeBrad King2021-07-091-0/+11
| | | | | | | | Since commit 84036d30d4 (IntelLLVM: Fix C/C++ standard level flags on Windows, 2021-07-07, v3.21.0-rc3~8^2~1) we activate C/C++ standard level logic for IntelLLVM when targeting the MSVC ABI. Update the `RunCMake.try_compile` test to be aware of this even when CMake is itself configured by an older CMake that does not know this.
* Merge topic 'check_cxx_compiler_flag_no_normal_variable' into release-3.21Brad King2021-07-081-0/+10
|\ | | | | | | | | | | | | 018d300ca0 Check*CompilerFlag: Do not set result as a normal variable too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6318
| * Check*CompilerFlag: Do not set result as a normal variable tooRobert Maynard2021-07-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | This was previously fixed by commit d46590910c (Check*CompilerFlag: Do not set result as a normal variable too, 2020-09-21, v3.18.3~1^2^2), but was regressed by refactoring in commit 90dead024c (CheckCompilerFlag: unified way to check compiler flags per language, 2020-09-25, v3.19.0-rc1~88^2) due to the changes being developed concurrently. Fix it again, and add a test case. Fixes: #21207
* | CMakePresets.json: Make --list-presets show presets with no generatorKyle Edwards2021-07-065-13/+20
| | | | | | | | Fixes: #22389
* | Tests: Fix newline matching in several RunCMake.* casesBrad King2021-07-0218-21/+42
| | | | | | | | | | | | | | | | The RunCMake infrastructure's `*-stdout.txt` expected output files interpret `\n` as a `\` and `n` rather than a newline. Use a literal newline instead. Otherwise the cases that were trying to match any configuration name via `[^\n]*` would fail on `RelWithDebInfo` because it contains the letter `n`.
* | Merge topic 'CMP0126-WARNING' into release-3.21Brad King2021-06-304-0/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | 16208ac113 CMP0126: Add control for warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6282
| * | CMP0126: Add control for warningsMarc Chevrier2021-06-294-0/+20
| | | | | | | | | | | | Fixes: #22353
* | | Merge topic 'rpm-suggests' into release-3.21Brad King2021-06-302-11/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9b53eca317 CPack/RPM: Fix weak dep support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6274
| * | | CPack/RPM: Fix weak dep supportAlex Sweet2021-06-292-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RPM 4.11.3 for el7 contains backported support for the RPM weak dep tags. It only supports querying those tags, but rpmbuild can not make use of them. Since CPack relies on rpmbuild --querytags to check for support, this commit switches to rpm --suggests to check for support of weak dependencies. Fixes: #22350
* | | | target_link_libraries: Restore transitive out-of-dir linkingBrad King2021-06-294-0/+16
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 7f506b95a7 (cmGeneratorTarget: Refactor link item lookup, 2021-05-26, v3.21.0-rc1~103^2~4) accidentally dropped the persistent lookup scope tracking across multiple items that was added by commit f0e67da061 (target_link_libraries: Fix out-of-dir linking of a list of targets, 2020-01-14, v3.17.0-rc1~149^2). This broke a transitive out-of-dir linking case not covered by our test suite. Restore the scope tracking and add a test case. Fixes: #22363
* | | Tests/RunCMake/Ninja.*: Sanitize NINJA_STATUS since we expect default behaviorNAKAMURA Takumi2021-06-282-0/+6
|/ / | | | | | | FYI, NINJA_STATUS is "[%f/%t] " by default.
* | Merge topic 'vs2022' into release-3.21Brad King2021-06-286-12/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 93c718791e VS: Use 64-bit MSBuild in VS 2022 c46b265839 VS: Add Visual Studio 17 2022 generator b610b7a35c VS: Update v142 CL flag table for VS 17.0 Preview 1 43375c6418 Help: Remove unnecessary Sphinx versionadded markup in VS toolset selection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6268
| * | VS: Add Visual Studio 17 2022 generatorBrad King2021-06-256-12/+18
| | | | | | | | | | | | Fixes: #22339
* | | Tests: Shorten RunCMake.GenEx-* case namesBrad King2021-06-25221-176/+176
|/ / | | | | | | Reduce the length of the longest path on disk needed by the tests.
* | Merge topic 'test-xcode-13' into release-3.21Brad King2021-06-212-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 1dd0eae4fc Tests: Fix xcode version detection for Xcode 13 on ARM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6248
| * | Tests: Fix xcode version detection for Xcode 13 on ARMBrad King2021-06-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running `xcode -version` on an ARM box prints content to stderr: objc[...]: Class ... is implemented in both... One of the two will be used. Which one is undefined. Capture and parse only stdout. Otherwise we might configure test behavior for the wrong version of Xcode.
* | | Merge topic 'fix-flow-control-override'Brad King2021-06-173-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | c017098d4d CMake: Allow override of unexpected non-flow-control commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6232
| * | CMake: Allow override of unexpected non-flow-control commandsKyle Edwards2021-06-163-0/+5
| | | | | | | | | | | | Fixes: #22310
| * | Merge topic 'presets-build-fixes' into release-3.20Brad King2021-06-093-5/+28
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 534c40e6d8 presets: Fix buildPreset "targets" not allowing a single string 5d67632813 presets: Fix buildPreset "jobs" 93e396b402 presets: Fix buildPreset "jobs" field test case Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !6190
* | | | CMakeDependentOption: Allow parentheses in the depends stringDaniel Schürmann2021-06-144-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `if()` takes the condition as a list of arguments. Parentheses need to be separated as well. Fixes: #22303
* | | | Merge topic 'xcode13-linker-output'Brad King2021-06-142-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7bbbbf73b Tests: ignore Xcode DVTPlugInManager output 8dcdd4351f Tests: recognize Xcode 13 linker warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6216
| * | | | Tests: ignore Xcode DVTPlugInManager outputGregor Jasny2021-06-101-0/+1
| | | | |
| * | | | Tests: recognize Xcode 13 linker warningGregor Jasny2021-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker shipped with Xcode 13 changed the architecture mismatch linker warning into: ``` ld: warning: ignoring file libfoo.a, building for macOS-x86_64 but attempting to link with file built for macOS-i386 ```
* | | | | Merge topic 'dir-IMPORTED_TARGETS'Brad King2021-06-113-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e13704ce72 Add directory property to list imported targets ea6d338ea1 cmState: Record imported target names in each directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6215
| * | | | | Add directory property to list imported targetsBrad King2021-06-103-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Model the change after commit cbca65826c (Add directory property to list buildsystem targets, 2016-09-19, v3.7.0-rc1~79^2~1). Fixes: #22291
* | | | | | Merge topic 'ci-rpm'Brad King2021-06-113-2/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 369725faa5 gitlab-ci: add job to run CPack RPM tests 1186ed64d0 ci: add rpm-build to Fedora base image 60380bd77c Tests: Fix RunCMake.CPack_RPM.DEBUGINFO test case 5130ff6878 Tests: Fix CPackComponentsForAll-RPM-IgnoreGroup test on Fedora 34 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6214
| * | | | | | Tests: Fix RunCMake.CPack_RPM.DEBUGINFO test caseBrad King2021-06-101-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c826745f5a (CPack/DEB: Do not crash when asked for debug symbols when there are none, 2020-10-29, v3.20.0-rc1~461^2) the test fails because CPackRPM warns about no sources in which to find debug symbols. Add expected output for this case.
| * | | | | | Tests: Fix CPackComponentsForAll-RPM-IgnoreGroup test on Fedora 34Brad King2021-06-102-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the cross-arch case from commit f174b919d6 (Tests: CpackRPM test component architecture, 2015-02-19, v3.3.0-rc1~415^2~1) to use `armv7hl`, which is supported by current RPM versions. Fixes: #19983
* | | | | | Merge topic 'test-CPackComponentsForAll-errors'Brad King2021-06-111-3/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45935ac973 Tests: Improve CPackComponentsForAll test error formatting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6212
| * | | | | | Tests: Improve CPackComponentsForAll test error formattingBrad King2021-06-101-3/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | Format message content for `message(FATAL_ERROR)`.
* | | | | | Merge topic 'FindBLAS-mkl-gnu'Brad King2021-06-112-16/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daa0a1f877 Find{BLAS,LAPACK}: Add tests covering Intel MKL with GNU compiler 624110b90d FindBLAS: Revert "Do not statically link against iomp5 ... Intel MKL" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6213
| * | | | | Find{BLAS,LAPACK}: Add tests covering Intel MKL with GNU compilerBrad King2021-06-102-16/+44
| | | | | |
* | | | | | Merge topic 'vs-custom-depfile'Brad King2021-06-101-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 526e2ef71c VS: Add support for add_custom_command DEPFILE 794ad78abb Help: Generalize release note filename for add_custom_command DEPFILE 7291f31254 cmTransformDepfile: Add support for MSBuild AdditionalInputs format a6de8ec51b cmTransformDepfile: Make directory for transformed depfile automatically Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6206
| * | | | | | VS: Add support for add_custom_command DEPFILEBrad King2021-06-091-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transform the depfile into MSBuild `AdditionalInputs` content. Add MSBuild Targets to update `AdditionalInputs` and the `.tlog` files for future builds without actually modifying the `.vcxproj` file. Fixes: #20286
* | | | | | Merge topic 'ctest_custom_details'Brad King2021-06-102-0/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02f1271bdf ctest: allow test output to override the 'details' field Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6204