[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [qca] /: Fix plugins lookup when not building in the Qt prefix
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2014-07-31 23:50:36
Message-ID: E1XD07I-0008Vl-Fx () scm ! kde ! org
[Download RAW message or body]

Git commit 38e0665127650b3db5676c1dd5f0ffeb8cdb176f by Aleix Pol.
Committed on 31/07/2014 at 23:48.
Pushed by apol into branch 'master'.

Fix plugins lookup when not building in the Qt prefix

QCoreApplication::libraryPaths points to the QT_PLUGIN_PATH, these
usually point to the lib/plugins directory, rather than lib/ itself.

M  +1    -1    CMakeLists.txt

http://commits.kde.org/qca/38e0665127650b3db5676c1dd5f0ffeb8cdb176f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24d8ab3..a4dc6de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,7 +158,7 @@ else( QCA_INSTALL_IN_QT_PREFIX )
   set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PAT=
H "Directory where lib will install")
 =

   set(QCA_PREFIX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Directo=
ry where qca will install")
-  set(QCA_PLUGINS_INSTALL_DIR "${LIB_INSTALL_DIR}/${QCA_LIB_NAME}/crypto" =
CACHE PATH "Directory where qca plugins will install")
+  set(QCA_PLUGINS_INSTALL_DIR "${LIB_INSTALL_DIR}/plugins/${QCA_LIB_NAME}/=
crypto" CACHE PATH "Directory where qca plugins will install")
   set(QCA_BINARY_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Dir=
ectory where qca plugins will install")
   set(QCA_LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}" CACHE PATH "Directory w=
here qca library will install")
   set(QCA_FEATURE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/mkspecs/features" C=
ACHE PATH "Directory where qca feature file will install")
[prev in list] [next in list] [prev in thread] [next in thread]