Permalink
Browse files
compile custom widgets on Travis
- Loading branch information
Showing
with
4 additions
and
3 deletions.
-
+2
−0
ci/travis/linux/install.sh
-
+2
−3
src/customwidgets/CMakeLists.txt
|
|
@@ -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 |
|
|
|
|
|
|
|
|
@@ -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}) |
|
|
|
