Skip to content
Permalink
Browse files

removed qt5charts stuff from cmakelist

because it's not needed there. should be used in runtime.
so it included qt5charts in installs
  • Loading branch information
signedav committed Sep 14, 2018
1 parent be7cc68 commit b8b737fa0cc7eedd44864b0c9da2188074f9ad39
Showing with 3 additions and 11 deletions.
  1. +0 −1 .docker/qgis3-build-deps.dockerfile
  2. +2 −1 debian/control.in
  3. +1 −0 rpm/qgis.spec.template
  4. +0 −9 src/gui/CMakeLists.txt
@@ -39,7 +39,6 @@ RUN apt-get update \
libqt5qml5 \
libqt5quick5 \
libqt5quickcontrols2-5 \
libqt5charts5-dev \
libqt5scintilla2-dev \
libqt5sql5-sqlite \
libqt5svg5-dev \
@@ -78,7 +78,8 @@ Architecture: all
Depends:
libjs-jquery,
libjs-leaflet,
${misc:Depends}
${misc:Depends},
qml-module-qtcharts
Description: QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
@@ -107,6 +107,7 @@ BuildRequires: qwt-qt5-devel
# Installation of QCA plugins must be explicit
Requires: qca-qt5-ossl
Requires: gpsbabel
Requires: qt5-qtcharts

# We don't want to provide private Python extension libs
%global __provides_exclude_from ^(%{python3_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
@@ -737,15 +737,6 @@ SET(QGIS_GUI_MOC_HDRS
FIND_PACKAGE(Qt5Qml REQUIRED)
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

0 comments on commit b8b737f

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