dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Change Qt 5/6 option

Browse Source
This commit is contained in:
Jonas Kvinge
2020-10-01 19:43:39 +02:00
parent 8f9dbfee2c
commit ae6a50626d
11 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
enable_testing()
if(WITH_QT6)
if(BUILD_WITH_QT6)
find_package(Qt6 COMPONENTS Test REQUIRED)
set(QtTest_LIBRARIES Qt6::Test)
else()
@@ -22,7 +22,7 @@ set(TESTUTILS-SOURCES
set(TESTUTILS-MOC-HEADERS src/mock_networkaccessmanager.h src/test_utils.h src/testobjectdecorators.h)
if(WITH_QT6)
if(BUILD_WITH_QT6)
qt6_wrap_cpp(TESTUTILS-SOURCES-MOC ${TESTUTILS-MOC-HEADERS})
else()
qt5_wrap_cpp(TESTUTILS-SOURCES-MOC ${TESTUTILS-MOC-HEADERS})
@@ -82,7 +82,7 @@ add_custom_target(strawberry_tests echo "Running Strawberry tests" WORKING_DIREC
add_custom_target(build_tests WORKING_DIRECTORY ${CURRENT_BINARY_DIR})
add_dependencies(strawberry_tests build_tests)
if(WITH_QT6)
if(BUILD_WITH_QT6)
qt6_add_resources(TEST-RESOURCE-SOURCES data/testdata.qrc)
else()
qt5_add_resources(TEST-RESOURCE-SOURCES data/testdata.qrc)