diff options
| author | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2013-05-31 11:49:56 +0300 |
|---|---|---|
| committer | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2013-06-07 14:46:23 +0300 |
| commit | acc84140425f122ab0bdb3a7fd8efb01ec931acc (patch) | |
| tree | 2887871c5270ef536f19f2b33fb702d42d990263 | |
| parent | 883f5ebf6bc2af2decd4e64aeda1ee92bff40e54 (diff) | |
tests/compilation: Pass the cmake generator to the compilation tests
This is useful on windows, where the default generator
is most likely not what we want
| -rw-r--r-- | tests/compilation/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/compilation/RunCompilationTests.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/compilation/CMakeLists.txt b/tests/compilation/CMakeLists.txt index f621a09..064967a 100644 --- a/tests/compilation/CMakeLists.txt +++ b/tests/compilation/CMakeLists.txt @@ -8,5 +8,6 @@ add_test(NAME compilation_tests -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} -DBINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/CompilationTests -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} + -DGENERATOR=${CMAKE_GENERATOR} -P ${CMAKE_CURRENT_SOURCE_DIR}/RunCompilationTests.cmake ) diff --git a/tests/compilation/RunCompilationTests.cmake b/tests/compilation/RunCompilationTests.cmake index 6487bf2..f1f4dcf 100644 --- a/tests/compilation/RunCompilationTests.cmake +++ b/tests/compilation/RunCompilationTests.cmake @@ -12,6 +12,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${SOURCE_DIR}/CompilationTests. # Run cmake to execute the tests execute_process(COMMAND ${CMAKE_COMMAND} + -G "${GENERATOR}" -DQT_VERSION=${QT_VERSION} -DQTGLIB_LIBRARY=${QTGLIB_LIBRARY} -DQTGSTREAMER_LIBRARY=${QTGSTREAMER_LIBRARY} |