Skip to content
Permalink
Browse files

more includes

  • Loading branch information
signedav committed Sep 14, 2018
1 parent 6d16b59 commit be7cc689b69643f84be9421bc86438acfc85329c
Showing with 6 additions and 5 deletions.
  1. +1 −1 .docker/qgis3-build-deps.dockerfile
  2. +5 −4 src/gui/CMakeLists.txt
@@ -39,7 +39,7 @@ RUN apt-get update \
libqt5qml5 \
libqt5quick5 \
libqt5quickcontrols2-5 \
libqt5charts5 \
libqt5charts5-dev \
libqt5scintilla2-dev \
libqt5sql5-sqlite \
libqt5svg5-dev \
@@ -739,8 +739,13 @@ FIND_PACKAGE(Qt5QuickWidgets REQUIRED)

IF(Qt5Widgets_VERSION VERSION_GREATER 5.7.0)
FIND_PACKAGE(Qt5Charts REQUIRED )
IF(Qt5Charts_FOUND)
INCLUDE_DIRECTORIES( ${Qt5Charts_INCLUDE_DIRS} )
TARGET_LINK_LIBRARIES(${Qt5Charts_LIBRARIES})
ENDIF(Qt5Charts_FOUND)
ENDIF(Qt5Widgets_VERSION VERSION_GREATER 5.7.0)


IF(Qt5Qml_FOUND)
ADD_DEFINITIONS(-DWITH_QML)
SET(QGIS_GUI_MOC_HDRS
@@ -1037,10 +1042,6 @@ TARGET_LINK_LIBRARIES(qgis_gui
${Qt5QuickWidgets_LIBRARIES}
)

IF(Qt5Widgets_VERSION VERSION_GREATER 5.7.0)
TARGET_LINK_LIBRARIES(qgis_gui ${Qt5Charts_LIBRARIES})
ENDIF(Qt5Widgets_VERSION VERSION_GREATER 5.7.0)

IF(ENABLE_MODELTEST)
TARGET_LINK_LIBRARIES(qgis_gui ${Qt5Test_LIBRARIES})
ENDIF(ENABLE_MODELTEST)

0 comments on commit be7cc68

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