diff options
| author | Brad King <brad.king@kitware.com> | 2021-12-09 15:38:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-12-09 15:38:27 (GMT) |
| commit | 01e768850a4b250c5775e95c1568d59de07105de (patch) | |
| tree | 82338b457e3e223757ab746d9b19d04d027bff4b /Tests | |
| parent | 4c23e0272bbb13168d6c82ab558f26a4e6e0e278 (diff) | |
| parent | 61c46c95aecd09e335dfae7c3123053c3e2ef381 (diff) | |
| download | CMake-01e768850a4b250c5775e95c1568d59de07105de.zip CMake-01e768850a4b250c5775e95c1568d59de07105de.tar.gz CMake-01e768850a4b250c5775e95c1568d59de07105de.tar.bz2 | |
Merge topic 'simplify-backtrace'
61c46c95ae cmListFileContext: Simplify explicit rule-of-five members
d0ceb409ff cmListFileBacktrace: Remove unused "Depth" method
7b677dbb92 cmListFileBacktrace: Remove unused "bottom" entry
56dc22d488 cmMessenger: Make relative path conversion more explicit
c749982c13 cmTargetPropertyComputer: Simplify by restoring use of cmMakefile
3d378541bb cmMessenger: Adopt backtrace printing functions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6794
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/GeneratorExpression/TARGET_PROPERTY-LOCATION-stderr.txt | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/file/GLOB-error-CONFIGURE_DEPENDS-modified-stderr.txt | 22 |
2 files changed, 16 insertions, 12 deletions
diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_PROPERTY-LOCATION-stderr.txt b/Tests/RunCMake/GeneratorExpression/TARGET_PROPERTY-LOCATION-stderr.txt index d4e5b29..a4c8dcd 100644 --- a/Tests/RunCMake/GeneratorExpression/TARGET_PROPERTY-LOCATION-stderr.txt +++ b/Tests/RunCMake/GeneratorExpression/TARGET_PROPERTY-LOCATION-stderr.txt @@ -1,4 +1,4 @@ -CMake Warning \(dev\) at TARGET_PROPERTY-LOCATION.cmake:2 \(add_library\): +CMake Warning \(dev\) in CMakeLists\.txt: Policy CMP0026 is not set: Disallow use of the LOCATION target property. Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy command to set the policy and suppress this warning. @@ -6,7 +6,3 @@ CMake Warning \(dev\) at TARGET_PROPERTY-LOCATION.cmake:2 \(add_library\): The LOCATION property should not be read from target "foo". Use the target name directly with add_custom_command, or use the generator expression \$<TARGET_FILE>, as appropriate. - -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/file/GLOB-error-CONFIGURE_DEPENDS-modified-stderr.txt b/Tests/RunCMake/file/GLOB-error-CONFIGURE_DEPENDS-modified-stderr.txt index d7b36eb..4c1aa67 100644 --- a/Tests/RunCMake/file/GLOB-error-CONFIGURE_DEPENDS-modified-stderr.txt +++ b/Tests/RunCMake/file/GLOB-error-CONFIGURE_DEPENDS-modified-stderr.txt @@ -1,7 +1,15 @@ -^CMake Error: The glob expression -.* at GLOB-error-CONFIGURE_DEPENDS-modified\.cmake:[0-9]+ \(file\) -was already present in the glob cache but the directory -contents have changed during the configuration run. -Matching glob expressions: - CONTENT_LIST_1 at GLOB-error-CONFIGURE_DEPENDS-modified\.cmake:[0-9]+ \(file\) - CONTENT_LIST_2 at GLOB-error-CONFIGURE_DEPENDS-modified\.cmake:[0-9]+ \(file\)$ +^CMake Error at GLOB-error-CONFIGURE_DEPENDS-modified\.cmake:[0-9]+ \(file\): + The glob expression + + [^ +]* + + was already present in the glob cache but the directory contents have + changed during the configuration run. + + Matching glob expressions: + + CONTENT_LIST_1 at GLOB-error-CONFIGURE_DEPENDS-modified\.cmake:[0-9]+ \(file\) + CONTENT_LIST_2 at GLOB-error-CONFIGURE_DEPENDS-modified\.cmake:[0-9]+ \(file\) +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ |