[Cmake-commits] CMake branch, next, updated. v2.8.7-2939-g6c1f286

[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  6c1f28618dc31610d4d3ebd06698a04074b15c98 (commit)
       via  5e1a5c44da395f8b2c121789e81f4a360a4088bc (commit)
      from  d2d0ad76cba19b0ad93eb9beadfd8857aeb0c871 (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=6c1f28618dc31610d4d3ebd06698a04074b15c98
commit 6c1f28618dc31610d4d3ebd06698a04074b15c98
Merge: d2d0ad7 5e1a5c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 28 13:41:19 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 28 13:41:19 2012 -0500

    Merge topic 'test-CMakeCommands' into next
    
    5e1a5c4 Add infrastructure for CMakeCommands tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e1a5c44da395f8b2c121789e81f4a360a4088bc
commit 5e1a5c44da395f8b2c121789e81f4a360a4088bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 28 11:34:10 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 28 11:34:10 2012 -0500

    Add infrastructure for CMakeCommands tests
    
    Generalize the build_command test framework as a macro to add the
    test.  Process the CMakeCommands subdirectory explicitly.

diff --git a/Tests/CMakeCommands/CMakeLists.txt b/Tests/CMakeCommands/CMakeLists.txt
new file mode 100644
index 0000000..e9e4020
--- /dev/null
+++ b/Tests/CMakeCommands/CMakeLists.txt
@@ -0,0 +1,10 @@
+macro(add_CMakeCommands_test test)
+  add_test(CMakeCommands.${test} ${CMAKE_CMAKE_COMMAND}
+    -DCMake_SOURCE_DIR=${CMake_SOURCE_DIR} # TODO: Remove
+    -Ddir=${CMAKE_CURRENT_BINARY_DIR}/${test}
+    -Dgen=${CMAKE_TEST_GENERATOR}
+    -P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/test.cmake"
+    )
+endmacro()
+
+add_CMakeCommands_test(build_command)
diff --git a/Tests/CMakeCommands/build_command/RunCMake.cmake b/Tests/CMakeCommands/build_command/test.cmake
similarity index 100%
rename from Tests/CMakeCommands/build_command/RunCMake.cmake
rename to Tests/CMakeCommands/build_command/test.cmake
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9c97828..3a1453b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -48,6 +48,7 @@ IF(BUILD_TESTING)
 
   ADD_SUBDIRECTORY(CMakeLib)
   ADD_SUBDIRECTORY(CMakeOnly)
+  ADD_SUBDIRECTORY(CMakeCommands)
 
   ADD_SUBDIRECTORY(FindPackageModeMakefileTest)
 
@@ -1695,13 +1696,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
   add_config_tests(Release)
   add_config_tests(RelWithDebInfo)
 
-  add_test(CMakeCommands.build_command ${CMAKE_CMAKE_COMMAND}
-    -DCMake_SOURCE_DIR=${CMake_SOURCE_DIR}
-    -Ddir=${CMake_BINARY_DIR}/Tests/CMakeCommands/build_command
-    -Dgen=${CMAKE_TEST_GENERATOR}
-    -P "${CMake_SOURCE_DIR}/Tests/CMakeCommands/build_command/RunCMake.cmake"
-  )
-
   ADD_TEST_MACRO(CMakeCommands.target_link_libraries target_link_libraries)
 
   CONFIGURE_FILE(

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

Summary of changes:
 Tests/CMakeCommands/CMakeLists.txt                 |   10 ++++++++++
 .../build_command/{RunCMake.cmake => test.cmake}   |    0
 Tests/CMakeLists.txt                               |    8 +-------
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 Tests/CMakeCommands/CMakeLists.txt
 rename Tests/CMakeCommands/build_command/{RunCMake.cmake => test.cmake} (100%)


hooks/post-receive
-- 
CMake