diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-28 14:33:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-28 14:33:38 (GMT) |
| commit | 6a0a4079efb032ec993b73358037b9bdd33dcfa5 (patch) | |
| tree | 6e40722f422823b87bdc693a63d1e8aefba9e7f6 /Tests/RunCMake | |
| parent | 0d59fa3ca4943e1ca5da36573b055a381642332a (diff) | |
| parent | 70c50962fb405cfb89637f24aa38c3e0fd5cbd87 (diff) | |
| download | CMake-6a0a4079efb032ec993b73358037b9bdd33dcfa5.zip CMake-6a0a4079efb032ec993b73358037b9bdd33dcfa5.tar.gz CMake-6a0a4079efb032ec993b73358037b9bdd33dcfa5.tar.bz2 | |
Merge topic 'shorten-test-paths'
70c50962 Tests: Shorten paths in ExternalProjectLocal
539c5c25 Tests: Shorten paths in RunCMake.CompileFeatures
494f6e8d Tests: Shorten paths in CompileDefinitions
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-result.txt (renamed from Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-result.txt) | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-stderr.txt (renamed from Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-stderr.txt) | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand.cmake (renamed from Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features.cmake) | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-result.txt b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-result.txt index d00491f..d00491f 100644 --- a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-result.txt +++ b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-result.txt diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-stderr.txt b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-stderr.txt index d819d15..1f2c113 100644 --- a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-stderr.txt +++ b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-stderr.txt @@ -1,4 +1,4 @@ -CMake Error at NotAFeature_OriginDebug_target_compile_features.cmake:4 \(target_compile_features\): +CMake Error at NotAFeature_OriginDebugCommand.cmake:4 \(target_compile_features\): target_compile_features specified unknown feature "not_a_feature" for target "somelib". Call Stack \(most recent call first\): diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features.cmake b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand.cmake index 467d9a1..467d9a1 100644 --- a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features.cmake +++ b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand.cmake diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake index 1892a5c..376f75a 100644 --- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake +++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake @@ -6,7 +6,7 @@ run_cmake(NotAFeatureTransitive) run_cmake(NotAFeature_OriginDebug) run_cmake(NotAFeature_OriginDebugGenex) run_cmake(NotAFeature_OriginDebugTransitive) -run_cmake(NotAFeature_OriginDebug_target_compile_features) +run_cmake(NotAFeature_OriginDebugCommand) run_cmake(generate_feature_list) file(READ |