include image resource in gui tests (perhaps fixes trusty nightly tests)

qgis · Feb 6, 2016 · 093eb41 · 093eb41
1 parent f2a05f2
commit 093eb41
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt
@@ -86,10 +86,13 @@ ENDIF (APPLE)
 #  ADD_TEST(qgis_quickprinttest ${CMAKE_INSTALL_PREFIX}/bin/qgis_quickprinttest)
 #ENDIF (APPLE)
 
+SET(IMAGE_RCCS ../../../images/images.qrc)
+QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
+
 MACRO (ADD_QGIS_TEST testname testsrc)
   SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
   SET(qgis_${testname}_MOC_CPPS ${testsrc})
-  ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
+  ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS} ${IMAGE_RCC_SRCS})
   SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
   TARGET_LINK_LIBRARIES(qgis_${testname}
     ${QT_QTXML_LIBRARY}
@@ -122,13 +125,13 @@ ADD_QGIS_TEST(zoomtest testqgsmaptoolzoom.cpp)
 
 #ADD_QGIS_TEST(histogramtest testqgsrasterhistogram.cpp)
 ADD_QGIS_TEST(doublespinbox testqgsdoublespinbox.cpp)
-ADD_QGIS_TEST(dualviewtest testqgsdualview.cpp )
-ADD_QGIS_TEST(fieldexpressionwidget testqgsfieldexpressionwidget.cpp )
-ADD_QGIS_TEST(filewidget testqgsfilewidget.cpp )
-ADD_QGIS_TEST(mapcanvastest testqgsmapcanvas.cpp )
+ADD_QGIS_TEST(dualviewtest testqgsdualview.cpp)
+ADD_QGIS_TEST(fieldexpressionwidget testqgsfieldexpressionwidget.cpp)
+ADD_QGIS_TEST(filewidget testqgsfilewidget.cpp)
+ADD_QGIS_TEST(mapcanvastest testqgsmapcanvas.cpp)
 ADD_QGIS_TEST(projectionissues testprojectionissues.cpp)
 ADD_QGIS_TEST(qgsguitest testqgsgui.cpp)
-ADD_QGIS_TEST(rubberbandtest testqgsrubberband.cpp )
+ADD_QGIS_TEST(rubberbandtest testqgsrubberband.cpp)
 ADD_QGIS_TEST(scalecombobox testqgsscalecombobox.cpp)
 ADD_QGIS_TEST(spinbox testqgsspinbox.cpp)