compile custom widgets on Travis

3nids · 3nids · commit 64748aaa8908 · 2017-02-06T13:55:11.000+01:00
diff --git a/ci/travis/linux/install.sh b/ci/travis/linux/install.sh
@@ -65,12 +65,14 @@ if [ "$CACHE_WARMING" = true ] ; then
     ${CMAKE_FLAGS}
     -DWITH_DESKTOP=OFF
     -DWITH_SERVER=OFF
+    -DWITH_CUSTOM_WIDGETS=OFF
   "
 else
   CMAKE_FLAGS="
     ${CMAKE_FLAGS}
     -DWITH_DESKTOP=ON
     -DWITH_SERVER=ON
+    -DWITH_CUSTOM_WIDGETS=ON
   "
 fi
 
diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt
@@ -109,9 +109,8 @@ INCLUDE_DIRECTORIES(
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${GEOS_INCLUDE_DIR}
-  ${Qt5UiPlugin_INCLUDE_DIRS} # For Qt5
-  ${Qt5Designer_INCLUDE_DIRS} # For Qt5
-  ${QT_QTDESIGNER_INCLUDE_DIR} # For Qt4
+  ${Qt5UiPlugin_INCLUDE_DIRS}
+  ${Qt5Designer_INCLUDE_DIRS}
 )
 
 QT5_WRAP_CPP(QGIS_CUSTOMWIDGETS_MOC_SRCS ${QGIS_CUSTOMWIDGETS_MOC_HDRS})

Original file line number	Diff line number	Diff line change
`@@ -109,9 +109,8 @@ INCLUDE_DIRECTORIES(`
`109`	`109`	`)`
`110`	`110`	`INCLUDE_DIRECTORIES(SYSTEM`
`111`	`111`	`${GEOS_INCLUDE_DIR}`
`112`		`- ${Qt5UiPlugin_INCLUDE_DIRS} # For Qt5`
`113`		`- ${Qt5Designer_INCLUDE_DIRS} # For Qt5`
`114`		`- ${QT_QTDESIGNER_INCLUDE_DIR} # For Qt4`
	`112`	`+ ${Qt5UiPlugin_INCLUDE_DIRS}`
	`113`	`+ ${Qt5Designer_INCLUDE_DIRS}`
`115`	`114`	`)`
`116`	`115`
`117`	`116`	`QT5_WRAP_CPP(QGIS_CUSTOMWIDGETS_MOC_SRCS ${QGIS_CUSTOMWIDGETS_MOC_HDRS})`