diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-22 13:39:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-22 13:39:50 (GMT) |
| commit | cd679aa8207790d9f25ec4a9b8c15f7e5bfa245f (patch) | |
| tree | 323fc2e176f32d131b089a2c6e4c8a93feffb210 /Tests | |
| parent | 57b5b074618d7adc8a50181c12fc944a84112495 (diff) | |
| parent | deec97d8eca4db67be09031757fd11f66c1a037b (diff) | |
| download | CMake-cd679aa8207790d9f25ec4a9b8c15f7e5bfa245f.zip CMake-cd679aa8207790d9f25ec4a9b8c15f7e5bfa245f.tar.gz CMake-cd679aa8207790d9f25ec4a9b8c15f7e5bfa245f.tar.bz2 | |
Merge topic 'revert-extra-qbs-generator'
deec97d8 Revert "Qbs: Add new 'extra' generator for qbs project files"
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index b61e3af..1f93675 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -589,21 +589,7 @@ 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 |