compile custom widgets on Travis

qgis · Feb 6, 2017 · 64748aaa890837aaf59fa7daad563e0626dc7e24 · 64748aa
1 parent d84725f
commit 64748aaa890837aaf59fa7daad563e0626dc7e24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
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})