Skip to content
Permalink
Browse files

Fix qt plugins directory setting again (followup 736e394)

  • Loading branch information
jef-n committed Aug 24, 2020
1 parent 3372a92 commit e2db34f6eccb617172780eed479ac47dcd7c6da9
Showing with 2 additions and 2 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −1 debian/rules
@@ -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)
@@ -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

0 comments on commit e2db34f

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