diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-23 13:18:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-23 13:18:43 (GMT) |
| commit | e85eb2e3368f2cc26149ef801c1a35979ffa1bad (patch) | |
| tree | ae5ae536c8ee2c74df554b7c442d6bc1112b97dd /Tests | |
| parent | 4f129615b3ec6d4f136ea77768745ef9649d11dc (diff) | |
| parent | f85db2f32358e6de921aba7d1cb8ecb81da934c0 (diff) | |
| download | CMake-e85eb2e3368f2cc26149ef801c1a35979ffa1bad.zip CMake-e85eb2e3368f2cc26149ef801c1a35979ffa1bad.tar.gz CMake-e85eb2e3368f2cc26149ef801c1a35979ffa1bad.tar.bz2 | |
Merge topic 'add-extra-qbs-generator'
f85db2f3 Qbs: Add new 'extra' generator for qbs project files
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 9e419f8..49fd02b 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -572,7 +572,21 @@ if(BUILD_TESTING) --test-command Simple) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Simple_KDevelop3Generator") endif () - + # check for the Qbs generator + if ("${cmakeOutput}" MATCHES Qbs) + add_test(Simple_QbsGenerator ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMake_SOURCE_DIR}/Tests/Simple" + "${CMake_BINARY_DIR}/Tests/Simple_QbsGenerator" + --build-two-config + --build-generator "Qbs - Unix Makefiles" + --build-generator-platform "${CMAKE_GENERATOR_PLATFORM}" + --build-generator-toolset "${CMAKE_GENERATOR_TOOLSET}" + --build-project Simple + --build-options ${build_options} + --test-command Simple) + list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Simple_QbsGenerator") + endif () endif() # test for correct sub-project generation |