diff options
| author | Brad King <brad.king@kitware.com> | 2012-02-28 16:36:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-02-28 16:36:22 (GMT) |
| commit | 52dffb9fbf31b70ef8b16fc21c3efb4da7046a78 (patch) | |
| tree | 950d8de408da013a4277097f9a97b41ed73bcf1e /Tests | |
| parent | d3651041e9f16876d227c757254256039d62d85b (diff) | |
| parent | 5e1a5c44da395f8b2c121789e81f4a360a4088bc (diff) | |
| download | CMake-52dffb9fbf31b70ef8b16fc21c3efb4da7046a78.zip CMake-52dffb9fbf31b70ef8b16fc21c3efb4da7046a78.tar.gz CMake-52dffb9fbf31b70ef8b16fc21c3efb4da7046a78.tar.bz2 | |
Merge branch 'test-CMakeCommands' into find_package-improve-messages
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeCommands/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Tests/CMakeCommands/build_command/test.cmake (renamed from Tests/CMakeCommands/build_command/RunCMake.cmake) | 0 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 8 |
3 files changed, 11 insertions, 7 deletions
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 index 55d9359..55d9359 100644 --- a/Tests/CMakeCommands/build_command/RunCMake.cmake +++ b/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( |