Skip to content
Permalink
Browse files

'fix' weird automoc test problem on wily

  • Loading branch information
jef-n committed Nov 22, 2015
1 parent 7840dbe commit 57c22e50209bba982510fef95cd3ed679551b688
Showing with 3 additions and 8 deletions.
  1. +3 −8 tests/src/core/CMakeLists.txt
@@ -57,9 +57,7 @@ ENDIF (APPLE)
#See: http://www.cmake.org/Wiki/CMake_RPATH_handling#No_relinking_and_full_RPATH_for_the_install_tree

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} ${testsrc} ${util_SRCS})
SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
TARGET_LINK_LIBRARIES(qgis_${testname}
${QT_QTXML_LIBRARY}
@@ -71,9 +69,6 @@ MACRO (ADD_QGIS_TEST testname testsrc)
${GDAL_LIBRARY}
qgis_core)
ADD_TEST(qgis_${testname} ${CMAKE_CURRENT_BINARY_DIR}/../../../output/bin/qgis_${testname} -maxwarnings 10000)
#SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES
# INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_DIR}
# INSTALL_RPATH_USE_LINK_PATH true )
ENDMACRO (ADD_QGIS_TEST)

#############################################################
@@ -86,7 +81,7 @@ ADD_QGIS_TEST(authconfigtest testqgsauthconfig.cpp)
ADD_QGIS_TEST(authmanagertest testqgsauthmanager.cpp)
ADD_QGIS_TEST(blendmodestest testqgsblendmodes.cpp)
ADD_QGIS_TEST(clippertest testqgsclipper.cpp)
ADD_QGIS_TEST(colorscheme testqgscolorscheme.cpp)
ADD_QGIS_TEST(colorschemetest testqgscolorscheme.cpp)
ADD_QGIS_TEST(colorschemeregistry testqgscolorschemeregistry.cpp)
ADD_QGIS_TEST(composerddtest testqgscomposerdd.cpp)
ADD_QGIS_TEST(composereffectstest testqgscomposereffects.cpp)
@@ -123,7 +118,7 @@ ADD_QGIS_TEST(featuretest testqgsfeature.cpp)
ADD_QGIS_TEST(fieldstest testqgsfields.cpp)
ADD_QGIS_TEST(fieldtest testqgsfield.cpp)
ADD_QGIS_TEST(filewritertest testqgsvectorfilewriter.cpp)
ADD_QGIS_TEST(fontmarkertest testqgsfontmarker.cpp)
ADD_QGIS_TEST(fontmarkertest2 testqgsfontmarker.cpp)
ADD_QGIS_TEST(fontutils testqgsfontutils.cpp)
ADD_QGIS_TEST(geometryimporttest testqgsgeometryimport.cpp)
ADD_QGIS_TEST(geometrytest testqgsgeometry.cpp)

4 comments on commit 57c22e5

@nyalldawson

This comment has been minimized.

Copy link
Contributor

@nyalldawson nyalldawson replied Nov 23, 2015

@jef-n thank you! Glad I wasn't the only one hitting this..

@jef-n

This comment has been minimized.

Copy link
Member Author

@jef-n jef-n replied Nov 23, 2015

@nyalldawson unfortunately it only partly helps - wily amd64 is still broken. really odd. seems to only affect wily - although unstable also has cmake 3.2.2-2 (build log):

/tmp/buildd/qgis-2.13.0+git20151123+57c22e5+23wily/tests/src/core/testqgsfontutils.cpp:151:32: fatal error: testqgsfontutils.moc: No such file or directory
compilation terminated.
@luipir

This comment has been minimized.

Copy link
Contributor

@luipir luipir replied Nov 23, 2015

@luipir

This comment has been minimized.

Copy link
Contributor

@luipir luipir replied Nov 23, 2015

I had a strange problem disappeared after re-run make
https://gist.github.com/luipir/7b873111a5802c21c138
I don't know if related because not part of the test copilation

Please sign in to comment.
You can’t perform that action at this time.