mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: update cmake to allow Qt5 and Qt6

Browse source 
Qt6 builds of course still fail, but now they are at least possible.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2022-02-09 15:02:30 -08:00
parent c4319e3995
commit ce254bee57
6 changed files with 97 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/CMakeLists.txt
View file

@ -1,5 +1,9 @@
# QTest based tests
qt5_add_resources(SUBSURFACE_TEST_RESOURCES ../subsurface.qrc)
if(NOT USINGQT6)
qt5_add_resources(SUBSURFACE_TEST_RESOURCES ../subsurface.qrc)
else()
qt_add_resources(SUBSURFACE_TEST_RESOURCES ../subsurface.qrc)
endif()
# Access test data (dive folder) from SUBSURFACE_SOURCE by default.
# In cross compilation cases or when test will not be executed at build time