Skip to content

Commit 64748aa

Browse files
committed
compile custom widgets on Travis
1 parent d84725f commit 64748aa

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

ci/travis/linux/install.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,14 @@ if [ "$CACHE_WARMING" = true ] ; then
6565
${CMAKE_FLAGS}
6666
-DWITH_DESKTOP=OFF
6767
-DWITH_SERVER=OFF
68+
-DWITH_CUSTOM_WIDGETS=OFF
6869
"
6970
else
7071
CMAKE_FLAGS="
7172
${CMAKE_FLAGS}
7273
-DWITH_DESKTOP=ON
7374
-DWITH_SERVER=ON
75+
-DWITH_CUSTOM_WIDGETS=ON
7476
"
7577
fi
7678

src/customwidgets/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,8 @@ INCLUDE_DIRECTORIES(
109109
)
110110
INCLUDE_DIRECTORIES(SYSTEM
111111
${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}
115114
)
116115

117116
QT5_WRAP_CPP(QGIS_CUSTOMWIDGETS_MOC_SRCS ${QGIS_CUSTOMWIDGETS_MOC_HDRS})

0 commit comments

Comments
 (0)