diff options
| author | Brad King <brad.king@kitware.com> | 2013-02-18 15:07:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-02-18 15:07:03 (GMT) |
| commit | 2963c9828ce5193334d60b38b051f1ce59bb3df3 (patch) | |
| tree | 81fb6cde636f9527bd345159800591d56a26edf8 /Tests/RunCMake/RunCMake.cmake | |
| parent | 1df09e57732501454ac2bee900d2aad963a84969 (diff) | |
| parent | ccfeefae356241cd05ed06f595c697379620e512 (diff) | |
| download | CMake-2963c9828ce5193334d60b38b051f1ce59bb3df3.zip CMake-2963c9828ce5193334d60b38b051f1ce59bb3df3.tar.gz CMake-2963c9828ce5193334d60b38b051f1ce59bb3df3.tar.bz2 | |
Merge branch 'empty-compiler-crash' into compiler-change-cleanup
Diffstat (limited to 'Tests/RunCMake/RunCMake.cmake')
| -rw-r--r-- | Tests/RunCMake/RunCMake.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index c3c161a..40b98d4 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -29,9 +29,15 @@ function(run_cmake test) set(RunCMake_TEST_BINARY_DIR "${top_bin}/${test}-build") file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") + if(NOT DEFINED RunCMake_TEST_OPTIONS) + set(RunCMake_TEST_OPTIONS "") + endif() execute_process( COMMAND ${CMAKE_COMMAND} "${RunCMake_TEST_SOURCE_DIR}" - -G "${RunCMake_GENERATOR}" -DRunCMake_TEST=${test} + -G "${RunCMake_GENERATOR}" + -T "${RunCMake_GENERATOR_TOOLSET}" + -DRunCMake_TEST=${test} + ${RunCMake_TEST_OPTIONS} WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}" OUTPUT_VARIABLE actual_stdout ERROR_VARIABLE actual_stderr |