[Cmake-commits] CMake branch, next, updated. v3.1.1-2244-gda9ed6b

[Matt McCormick]

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  da9ed6be3896a3bdaed9cddfbf2fccc944992451 (commit)
       via  52a4fe75063d77f2b79ffd9bb93b1e48cd7af3dd (commit)
      from  2d65931be441528733687bb62f2d111eee659e27 (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=da9ed6be3896a3bdaed9cddfbf2fccc944992451
commit da9ed6be3896a3bdaed9cddfbf2fccc944992451
Merge: 2d65931 52a4fe7
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Thu Jan 22 14:00:16 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 22 14:00:16 2015 -0500

    Merge topic 'if-test' into next
    
    52a4fe75 Tests: Move if command TestName test to RunCMake group.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52a4fe75063d77f2b79ffd9bb93b1e48cd7af3dd
commit 52a4fe75063d77f2b79ffd9bb93b1e48cd7af3dd
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Thu Jan 22 13:58:53 2015 -0500
Commit:     Matt McCormick <matt.mccormick at kitware.com>
CommitDate: Thu Jan 22 13:58:53 2015 -0500

    Tests: Move if command TestName test to RunCMake group.
    
    The RunCMake group is preferred over the Complex test.

diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt
index 102da6b..bbd5878 100644
--- a/Tests/Complex/Executable/CMakeLists.txt
+++ b/Tests/Complex/Executable/CMakeLists.txt
@@ -21,19 +21,6 @@ if(TARGET NotATarget)
   message(FATAL_ERROR "if(TARGET NotATarget) returned true!")
 endif()
 
-# Test if(TEST...
-add_test(NAME TestThatExists COMMAND ${CMAKE_COMMAND} -E echo "A CMake Test")
-if(TEST TestThatExists)
-  message(STATUS "if(TestThatExists) is true")
-else()
-  message(FATAL_ERROR "if(TestThatExists is false")
-endif()
-if(TEST TestThatDoesNotExist)
-  message(FATAL_ERROR "if(TestThatDoesNotExist is true")
-else()
-  message(STATUS "if(TestThatDoesNotExist) is false")
-endif()
-
 # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
 set(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
 link_libraries(${COMPLEX_LIBS})
diff --git a/Tests/RunCMake/if/RunCMakeTest.cmake b/Tests/RunCMake/if/RunCMakeTest.cmake
index 6b6b74b..9db79e9 100644
--- a/Tests/RunCMake/if/RunCMakeTest.cmake
+++ b/Tests/RunCMake/if/RunCMakeTest.cmake
@@ -2,3 +2,6 @@ include(RunCMake)
 
 run_cmake(IsDirectory)
 run_cmake(IsDirectoryLong)
+
+run_cmake(TestNameThatExists)
+run_cmake(TestNameThatDoesNotExist)
diff --git a/Tests/RunCMake/if/TestNameThatDoesNotExist-stdout.txt b/Tests/RunCMake/if/TestNameThatDoesNotExist-stdout.txt
new file mode 100644
index 0000000..8874ca8
--- /dev/null
+++ b/Tests/RunCMake/if/TestNameThatDoesNotExist-stdout.txt
@@ -0,0 +1 @@
+TestThatDoesNotExist is false
diff --git a/Tests/RunCMake/if/TestNameThatDoesNotExist.cmake b/Tests/RunCMake/if/TestNameThatDoesNotExist.cmake
new file mode 100644
index 0000000..68ad6e3
--- /dev/null
+++ b/Tests/RunCMake/if/TestNameThatDoesNotExist.cmake
@@ -0,0 +1,5 @@
+if(TEST TestThatDoesNotExist)
+  message(FATAL_ERROR "if TestThatDoesNotExist is true")
+else()
+  message(STATUS "if TestThatDoesNotExist is false")
+endif()
diff --git a/Tests/RunCMake/if/TestNameThatExists-stdout.txt b/Tests/RunCMake/if/TestNameThatExists-stdout.txt
new file mode 100644
index 0000000..54911bc
--- /dev/null
+++ b/Tests/RunCMake/if/TestNameThatExists-stdout.txt
@@ -0,0 +1 @@
+TestThatExists is true
diff --git a/Tests/RunCMake/if/TestNameThatExists.cmake b/Tests/RunCMake/if/TestNameThatExists.cmake
new file mode 100644
index 0000000..e03e148
--- /dev/null
+++ b/Tests/RunCMake/if/TestNameThatExists.cmake
@@ -0,0 +1,6 @@
+add_test(NAME TestThatExists COMMAND ${CMAKE_COMMAND} -E echo "A CMake Test")
+if(TEST TestThatExists)
+  message(STATUS "if TestThatExists is true")
+else()
+  message(FATAL_ERROR "if TestThatExists is false")
+endif()

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

Summary of changes:
 Tests/Complex/Executable/CMakeLists.txt               |   13 -------------
 Tests/RunCMake/if/RunCMakeTest.cmake                  |    3 +++
 Tests/RunCMake/if/TestNameThatDoesNotExist-stdout.txt |    1 +
 Tests/RunCMake/if/TestNameThatDoesNotExist.cmake      |    5 +++++
 Tests/RunCMake/if/TestNameThatExists-stdout.txt       |    1 +
 Tests/RunCMake/if/TestNameThatExists.cmake            |    6 ++++++
 6 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 Tests/RunCMake/if/TestNameThatDoesNotExist-stdout.txt
 create mode 100644 Tests/RunCMake/if/TestNameThatDoesNotExist.cmake
 create mode 100644 Tests/RunCMake/if/TestNameThatExists-stdout.txt
 create mode 100644 Tests/RunCMake/if/TestNameThatExists.cmake


hooks/post-receive
-- 
CMake