diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-15 21:46:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-15 21:46:49 (GMT) |
| commit | a85ee8b8cf4fb4be5f5ebd6e88e2753d1ec654ae (patch) | |
| tree | 51da8a46e0a6bb550d86dfdf2d6873afa3ec7420 | |
| parent | da7155f5bc70440ccb1238e73194c2a454442f8d (diff) | |
| download | CMake-a85ee8b8cf4fb4be5f5ebd6e88e2753d1ec654ae.zip CMake-a85ee8b8cf4fb4be5f5ebd6e88e2753d1ec654ae.tar.gz CMake-a85ee8b8cf4fb4be5f5ebd6e88e2753d1ec654ae.tar.bz2 | |
Tests: Simplify RunCMake test extra argument passing
Allow add_RunCMake_test calls to pass non-optional arguments
immediately.
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 4ec8feb..e74eadd 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -9,6 +9,7 @@ macro(add_RunCMake_test test) -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test} -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test} ${${test}_ARGS} + ${ARGN} -P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake" ) endmacro() @@ -131,8 +132,7 @@ if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0) add_RunCMake_test(IncompatibleQt) endif() if (QT4_FOUND) - set(ObsoleteQtMacros_ARGS -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}) - add_RunCMake_test(ObsoleteQtMacros) + add_RunCMake_test(ObsoleteQtMacros -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}) endif() find_package(PkgConfig QUIET) |