diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-03-11 15:06:22 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-18 11:04:10 +0200 |
commit | 69f55a1d1bd86f514d25575bcf9651c628a12d68 (patch) | |
tree | 7eb0f68aa76556888207930b4a6b4c37544650f5 /tests/auto/cmake | |
parent | 90bf96b9808c32153ecdd33fd1ad188f78137b1c (diff) |
Generate the cmake module tests, instead of having them outdated.
Change-Id: I89f8d11d84db06b4fd90a8fb5e77f469e619a45f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto/cmake')
-rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 5 | ||||
-rw-r--r-- | tests/auto/cmake/cmake.pro | 3 | ||||
-rw-r--r-- | tests/auto/cmake/test_modules/CMakeLists.txt | 27 | ||||
-rw-r--r-- | tests/auto/cmake/test_modules/main.cpp | 52 |
4 files changed, 5 insertions, 82 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 4f15a69ec..6851e1ec0 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -9,4 +9,7 @@ find_package(Qt5Core REQUIRED) include("${_Qt5CTestMacros}") -expect_pass(test_modules) +test_module_includes( + 3D QGLTexture2D + 3DQuick QQuickItem3D +) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index 1eddc67c2..406a031c1 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -2,7 +2,6 @@ # Cause make to do nothing. TEMPLATE = subdirs -CMAKE_QT_MODULES_UNDER_TEST = 3d +CMAKE_QT_MODULES_UNDER_TEST = 3d 3dquick -CONFIG += insignificant_test CONFIG += ctest_testcase diff --git a/tests/auto/cmake/test_modules/CMakeLists.txt b/tests/auto/cmake/test_modules/CMakeLists.txt deleted file mode 100644 index 02b1b1341..000000000 --- a/tests/auto/cmake/test_modules/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(test_modules) - -find_package(Qt5Quick REQUIRED) - -find_package(Qt53D REQUIRED) -find_package(Qt53DQuick REQUIRED) - -include_directories( - ${Qt53D_INCLUDE_DIRS} - ${Qt53DQuick_INCLUDE_DIRS} -) - -add_definitions( - ${Qt53D_DEFINITIONS} - ${Qt53DQuick_DEFINITIONS} -) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - -add_executable(mainapp main.cpp) -target_link_libraries(mainapp - ${Qt53D_LIBRARIES} - ${Qt53DQuick_LIBRARIES} -) diff --git a/tests/auto/cmake/test_modules/main.cpp b/tests/auto/cmake/test_modules/main.cpp deleted file mode 100644 index 8d0b3d36f..000000000 --- a/tests/auto/cmake/test_modules/main.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QGLTexture2D> -#include <QQuickItem3D> - -int main(int argc, char **argv) -{ - QGLTexture2D gLTexture2D; - - QQuickItem3D quickItem3D; - - return 0; -} |