diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-21 13:05:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-05-21 13:05:58 (GMT) |
| commit | deec97d8eca4db67be09031757fd11f66c1a037b (patch) | |
| tree | ec1caf0a6163aacc4a07ecdc5b33d6ae8de1e6cc /Tests | |
| parent | 3541fc73a12a52f87a2faa9790a65651658162d8 (diff) | |
| download | CMake-deec97d8eca4db67be09031757fd11f66c1a037b.zip CMake-deec97d8eca4db67be09031757fd11f66c1a037b.tar.gz CMake-deec97d8eca4db67be09031757fd11f66c1a037b.tar.bz2 | |
Revert "Qbs: Add new 'extra' generator for qbs project files"
This reverts commit f85db2f32358e6de921aba7d1cb8ecb81da934c0.
Discussion by the QtCreator community at
https://bugreports.qt.io/browse/QTCREATORBUG-13695
raises concerns about this particular approach to working with CMake
projects using QtCreator. Also, the functionality and design of the QBS
extra generator was never discussed on the CMake mailing list or with
QtCreator developers. There may be better ways to make the two tools
work together.
In order to avoid committing to long-term support of this generator
prior to such discussion taking place, revert it from CMake for now.
We may restore this or use an alternative design based on results of
such discussion.
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 |