[Cmake-commits] CMake branch, next, updated. v3.1.1-2310-gc4c05f4

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c4c05f4d6619641c241f90e43301e924013d0e69 (commit)
       via  539c5c252ef679d15f3af828da304ad9313640e2 (commit)
      from  82e135908ad68429d857e6439b9e10398b2668d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4c05f4d6619641c241f90e43301e924013d0e69
commit c4c05f4d6619641c241f90e43301e924013d0e69
Merge: 82e1359 539c5c2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 08:32:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 26 08:32:07 2015 -0500

    Merge topic 'shorten-test-paths' into next
    
    539c5c25 Tests: Shorten paths in RunCMake.CompileFeatures


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=539c5c252ef679d15f3af828da304ad9313640e2
commit 539c5c252ef679d15f3af828da304ad9313640e2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 25 08:09:10 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 26 08:30:57 2015 -0500

    Tests: Shorten paths in RunCMake.CompileFeatures
    
    Shorten the NotAFeature_OriginDebug_target_compile_features case name to
    avoid creating really long paths that fail with some tools on Windows.

diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-result.txt b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-result.txt
similarity index 100%
rename from Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-result.txt
rename to 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
similarity index 61%
rename from Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-stderr.txt
rename to 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
similarity index 100%
rename from Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features.cmake
rename to 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

-----------------------------------------------------------------------

Summary of changes:
 ...features-result.txt => NotAFeature_OriginDebugCommand-result.txt} |    0
 ...features-stderr.txt => NotAFeature_OriginDebugCommand-stderr.txt} |    2 +-
 ...t_compile_features.cmake => NotAFeature_OriginDebugCommand.cmake} |    0
 Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake                    |    2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename Tests/RunCMake/CompileFeatures/{NotAFeature_OriginDebug_target_compile_features-result.txt => NotAFeature_OriginDebugCommand-result.txt} (100%)
 rename Tests/RunCMake/CompileFeatures/{NotAFeature_OriginDebug_target_compile_features-stderr.txt => NotAFeature_OriginDebugCommand-stderr.txt} (61%)
 rename Tests/RunCMake/CompileFeatures/{NotAFeature_OriginDebug_target_compile_features.cmake => NotAFeature_OriginDebugCommand.cmake} (100%)


hooks/post-receive
-- 
CMake