Fix qt plugins directory setting again (followup 736e394)

qgis · Aug 24, 2020 · e2db34f · e2db34f
1 parent 3372a92
commit e2db34f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -411,7 +411,7 @@ IF(WITH_CORE)
   # get the Qt plugins directory
   GET_TARGET_PROPERTY(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
   EXEC_PROGRAM(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PLUGINS" RETURN_VALUE return_code OUTPUT_VARIABLE DEFAULT_QT_PLUGINS_DIR )
-  SET (QT_PLUGINS_DIR ${DEFAULT_QT_PLUGINS_DIR} CACHE PATH "Path to installation directory for Qt Plugins. Defaults to Qt native plugin directory")
+  SET (QT_PLUGINS_DIR ${DEFAULT_QT_PLUGINS_DIR} CACHE STRING "Path to installation directory for Qt Plugins. Defaults to Qt native plugin directory")
 
   MESSAGE(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}")
   IF (WITH_QUICK)

diff --git a/debian/rules b/debian/rules
@@ -38,7 +38,7 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
 	WITH_ORACLE=1
 endif
 
-QT_PLUGINS_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins
+QT_PLUGINS_DIR = lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins
 
 ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"buster bionic eoan focal"))
 	DISTRIBUTION := sid