From 21e8b1e363fcb46798aec49b623cfd2b29c286a3 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 5 Apr 2016 14:22:00 -0300 Subject: Fix compilation with the new folder architecture A few more fixes for things that broke in commit 7be962bfc287 ("Move subsurface-core to core and qt-mobile to mobile-widgets"). [Dirk Hohndel: slightly edited and overlap with Linus' patch removed] Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- tests/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tests/CMakeLists.txt') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a31e2c6f8..d516bb686 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,11 @@ # QTest based tests +qt5_add_resources(SUBSURFACE_TEST_RESOURCES ../subsurface.qrc) + +add_library(RESOURCE_LIBRARY STATIC ${SUBSURFACE_TEST_RESOURCES}) + macro(TEST NAME FILE) - add_executable(${NAME} ${FILE} ${SUBSURFACE_RESOURCES} ) - target_link_libraries(${NAME} subsurface_corelib ${QT_TEST_LIBRARIES} ${SUBSURFACE_LINK_LIBRARIES} ) + add_executable(${NAME} ${FILE} ) + target_link_libraries(${NAME} subsurface_corelib RESOURCE_LIBRARY ${QT_TEST_LIBRARIES} ${SUBSURFACE_LINK_LIBRARIES} ) add_test(NAME ${NAME} COMMAND $) endmacro() -- cgit v1.2.3-70-g09d2