summaryrefslogtreecommitdiffstats
path: root/cmake/tests
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2018-12-12 10:55:20 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2018-12-14 14:04:59 +0000
commite57a94cbd8f28ccab8b3368afc4365237c533a4f (patch)
treeabfa6a25629580f6a76a0cf2d06cdeb593339b2b /cmake/tests
parent07dfa3013c94ddfda692ac235b2e022f8265c450 (diff)
CMake: Use AUTOMOC/AUTOUIC/AUTORCC
Change-Id: I0235ca4f227623e5937348b4b010637921dbf154 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'cmake/tests')
-rw-r--r--cmake/tests/CMakeLists.txt3
-rw-r--r--cmake/tests/moc/CMakeLists.txt34
-rw-r--r--cmake/tests/moc/foo.cpp0
-rw-r--r--cmake/tests/moc/sub/bar.h0
-rw-r--r--cmake/tests/moc/sub2/foobar.h0
-rw-r--r--cmake/tests/qrc/CMakeLists.txt31
-rw-r--r--cmake/tests/qrc/dialog/dialog.qrc0
-rw-r--r--cmake/tests/qrc/qrc.qrc0
-rw-r--r--cmake/tests/uic/CMakeLists.txt31
-rw-r--r--cmake/tests/uic/dialog/dialog.ui0
-rw-r--r--cmake/tests/uic/window.ui0
11 files changed, 0 insertions, 99 deletions
diff --git a/cmake/tests/CMakeLists.txt b/cmake/tests/CMakeLists.txt
index 44aacb7b07..6b53c9703d 100644
--- a/cmake/tests/CMakeLists.txt
+++ b/cmake/tests/CMakeLists.txt
@@ -45,7 +45,4 @@ macro(add_cmake_test_generate name)
endmacro()
add_cmake_test_generate(features)
-add_cmake_test_generate(moc)
-add_cmake_test_generate(qrc)
add_cmake_test_generate(qt_make_output_file)
-add_cmake_test_generate(uic)
diff --git a/cmake/tests/moc/CMakeLists.txt b/cmake/tests/moc/CMakeLists.txt
deleted file mode 100644
index 297b1ac17d..0000000000
--- a/cmake/tests/moc/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-cmake_minimum_required(VERSION 3.12.0)
-
-project(MocTest
- VERSION 1.0.0
- DESCRIPTION "Moc test"
- HOMEPAGE_URL "https://qt.io/"
- LANGUAGES CXX
-)
-
-## Add some paths to check for cmake modules:
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../;${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/extra-cmake-modules/find-modules;${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/kwin")
-
-## Qt specific setup common for all modules:
-include(QtSetup)
-
-include(../test.cmake)
-
-fake_moc_results(MOC foo.cpp sub2/foobar.h MOC_AND_BUILD main.cpp sub/bar.h)
-add_qt_executable(test_executable
- SOURCES
- ../main.cpp
- sub/bar.h
- sub2/foobar.h
- foo.cpp
-)
-
-test_source_file(test_executable "${CMAKE_CURRENT_BINARY_DIR}/main.moc" BUILD)
-test_source_file(test_executable "${CMAKE_CURRENT_BINARY_DIR}/sub/moc_bar.cpp" BUILD)
-test_source_file(test_executable "${CMAKE_CURRENT_BINARY_DIR}/sub2/moc_foobar.cpp")
-test_source_file(test_executable "${CMAKE_CURRENT_BINARY_DIR}/foo.moc")
-
-test_include_directory(test_executable "${CMAKE_CURRENT_BINARY_DIR}/sub" UNKNOWN)
-test_include_directory(test_executable "${CMAKE_CURRENT_BINARY_DIR}/sub2")
-
diff --git a/cmake/tests/moc/foo.cpp b/cmake/tests/moc/foo.cpp
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cmake/tests/moc/foo.cpp
+++ /dev/null
diff --git a/cmake/tests/moc/sub/bar.h b/cmake/tests/moc/sub/bar.h
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cmake/tests/moc/sub/bar.h
+++ /dev/null
diff --git a/cmake/tests/moc/sub2/foobar.h b/cmake/tests/moc/sub2/foobar.h
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cmake/tests/moc/sub2/foobar.h
+++ /dev/null
diff --git a/cmake/tests/qrc/CMakeLists.txt b/cmake/tests/qrc/CMakeLists.txt
deleted file mode 100644
index fc28390300..0000000000
--- a/cmake/tests/qrc/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-cmake_minimum_required(VERSION 3.12.0)
-
-project(QrcTest
- VERSION 1.0.0
- DESCRIPTION "Qrc test"
- HOMEPAGE_URL "https://qt.io/"
- LANGUAGES CXX
-)
-
-## Add some paths to check for cmake modules:
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../;${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/extra-cmake-modules/find-modules;${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/kwin")
-
-## Qt specific setup common for all modules:
-include(QtSetup)
-
-include(../test.cmake)
-
-fake_moc_results()
-add_qt_executable(test_executable
- SOURCES
- ../main.cpp
- qrc.qrc
-)
-
-fake_moc_results()
-extend_target(test_executable SOURCES dialog/dialog.qrc)
-
-test_source_file(test_executable "${CMAKE_CURRENT_BINARY_DIR}/qrc_qrc.cpp" BUILD)
-test_source_file(test_executable "${CMAKE_CURRENT_BINARY_DIR}/dialog/qrc_dialog.cpp" BUILD)
-
-test_include_directory(test_executable "${CMAKE_CURRENT_BINARY_DIR}/dialog" UNKNOWN)
diff --git a/cmake/tests/qrc/dialog/dialog.qrc b/cmake/tests/qrc/dialog/dialog.qrc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cmake/tests/qrc/dialog/dialog.qrc
+++ /dev/null
diff --git a/cmake/tests/qrc/qrc.qrc b/cmake/tests/qrc/qrc.qrc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cmake/tests/qrc/qrc.qrc
+++ /dev/null
diff --git a/cmake/tests/uic/CMakeLists.txt b/cmake/tests/uic/CMakeLists.txt
deleted file mode 100644
index b8455821de..0000000000
--- a/cmake/tests/uic/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-cmake_minimum_required(VERSION 3.12.0)
-
-project(UicTest
- VERSION 1.0.0
- DESCRIPTION "Uic test"
- HOMEPAGE_URL "https://qt.io/"
- LANGUAGES CXX
-)
-
-## Add some paths to check for cmake modules:
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../;${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/extra-cmake-modules/find-modules;${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/kwin")
-
-## Qt specific setup common for all modules:
-include(QtSetup)
-
-include(../test.cmake)
-
-fake_moc_results()
-add_qt_executable(test_executable
- SOURCES
- ../main.cpp
- window.ui
-)
-
-fake_moc_results()
-extend_target(test_executable SOURCES dialog/dialog.ui)
-
-test_source_file(test_executable "${CMAKE_CURRENT_BINARY_DIR}/ui_window.h")
-test_source_file(test_executable "${CMAKE_CURRENT_BINARY_DIR}/dialog/ui_dialog.h")
-
-test_include_directory(test_executable "${CMAKE_CURRENT_BINARY_DIR}/dialog")
diff --git a/cmake/tests/uic/dialog/dialog.ui b/cmake/tests/uic/dialog/dialog.ui
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cmake/tests/uic/dialog/dialog.ui
+++ /dev/null
diff --git a/cmake/tests/uic/window.ui b/cmake/tests/uic/window.ui
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cmake/tests/uic/window.ui
+++ /dev/null