cmake: Enable building more of the tools tests
This is incomplete. moc has compilation problems, some advanced parts of qmake tests are not supported by the converter. Change-Id: Ic389ddfa10a7558f21cf7ba9ead8e58157c760da Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
bf899ba53b
commit
1b1248d7cd
@ -36,7 +36,7 @@ if (TARGET Qt::Sql)
|
|||||||
endif()
|
endif()
|
||||||
add_subdirectory(testlib)
|
add_subdirectory(testlib)
|
||||||
if (NOT CMAKE_CROSSCOMPILE AND QT_FEATURE_process)
|
if (NOT CMAKE_CROSSCOMPILE AND QT_FEATURE_process)
|
||||||
# add_subdirectory(tools)
|
add_subdirectory(tools)
|
||||||
endif()
|
endif()
|
||||||
if (TARGET Qt::Xml)
|
if (TARGET Qt::Xml)
|
||||||
# add_subdirectory(xml)
|
# add_subdirectory(xml)
|
||||||
|
13
tests/auto/tools/CMakeLists.txt
Normal file
13
tests/auto/tools/CMakeLists.txt
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
# Generated from tools.pro.
|
||||||
|
|
||||||
|
add_subdirectory(qmakelib)
|
||||||
|
add_subdirectory(qmake)
|
||||||
|
#add_subdirectory(moc)
|
||||||
|
#add_subdirectory(rcc)
|
||||||
|
if(TARGET Qt::Widgets)
|
||||||
|
add_subdirectory(uic)
|
||||||
|
endif()
|
||||||
|
if(TARGET Qt::DBus)
|
||||||
|
add_subdirectory(qdbuscpp2xml)
|
||||||
|
add_subdirectory(qdbusxml2cpp)
|
||||||
|
endif()
|
27
tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
Normal file
27
tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
# Generated from qdbuscpp2xml.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_qdbuscpp2xml Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
add_qt_test(tst_qdbuscpp2xml
|
||||||
|
GUI
|
||||||
|
SOURCES
|
||||||
|
test1.h
|
||||||
|
tst_qdbuscpp2xml.cpp
|
||||||
|
PUBLIC_LIBRARIES
|
||||||
|
Qt::DBus
|
||||||
|
)
|
||||||
|
|
||||||
|
# Resources:
|
||||||
|
set(qdbuscpp2xml_resource_files
|
||||||
|
"test1.h"
|
||||||
|
)
|
||||||
|
|
||||||
|
add_qt_resource(tst_qdbuscpp2xml "qdbuscpp2xml"
|
||||||
|
PREFIX
|
||||||
|
"/tst_qdbuscpp2xml/"
|
||||||
|
FILES
|
||||||
|
${qdbuscpp2xml_resource_files}
|
||||||
|
)
|
||||||
|
|
31
tests/auto/tools/qmake/CMakeLists.txt
Normal file
31
tests/auto/tools/qmake/CMakeLists.txt
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
# Generated from qmake.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_qmake Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
# Collect test data
|
||||||
|
|
||||||
|
file(GLOB_RECURSE test_data_glob
|
||||||
|
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
"testdata/*")
|
||||||
|
list(APPEND test_data ${test_data_glob})
|
||||||
|
|
||||||
|
add_qt_test(tst_qmake
|
||||||
|
GUI
|
||||||
|
SOURCES
|
||||||
|
testcompiler.cpp testcompiler.h
|
||||||
|
tst_qmake.cpp
|
||||||
|
TESTDATA ${test_data}
|
||||||
|
)
|
||||||
|
|
||||||
|
## Scopes:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
#### Keys ignored in scope 2:.:.:qmake.pro:WIN32:
|
||||||
|
# testcase.timeout = "900"
|
||||||
|
|
||||||
|
extend_target(tst_qmake CONDITION (CMAKE_CROSSCOMPILING) # special case
|
||||||
|
DEFINES
|
||||||
|
QMAKE_CROSS_COMPILED
|
||||||
|
)
|
35
tests/auto/tools/qmakelib/CMakeLists.txt
Normal file
35
tests/auto/tools/qmakelib/CMakeLists.txt
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
# Generated from qmakelib.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_qmakelib Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
add_qt_test(tst_qmakelib
|
||||||
|
GUI
|
||||||
|
SOURCES
|
||||||
|
../../../../qmake/library/ioutils.cpp
|
||||||
|
../../../../qmake/library/proitems.cpp
|
||||||
|
../../../../qmake/library/qmakebuiltins.cpp
|
||||||
|
../../../../qmake/library/qmakeevaluator.cpp
|
||||||
|
../../../../qmake/library/qmakeglobals.cpp
|
||||||
|
../../../../qmake/library/qmakeparser.cpp
|
||||||
|
../../../../qmake/library/qmakevfs.cpp
|
||||||
|
../../../../qmake/library/registry.cpp
|
||||||
|
evaltest.cpp
|
||||||
|
parsertest.cpp
|
||||||
|
tst_qmakelib.cpp tst_qmakelib.h
|
||||||
|
DEFINES
|
||||||
|
PROEVALUATOR_FULL
|
||||||
|
PROEVALUATOR_SETENV
|
||||||
|
PROPARSER_DEBUG
|
||||||
|
INCLUDE_DIRECTORIES
|
||||||
|
../../../../qmake/library
|
||||||
|
)
|
||||||
|
|
||||||
|
## Scopes:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
extend_target(tst_qmakelib CONDITION WIN32
|
||||||
|
PUBLIC_LIBRARIES
|
||||||
|
advapi32
|
||||||
|
)
|
Loading…
Reference in New Issue
Block a user