From 8a9c8278e2fbc27be423a9b942ddcbed3135d533 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sun, 13 Nov 2011 15:39:44 +0100 Subject: [PATCH] Search for *_tomahawkresolver in CMAKE_INSTALL_LIBEXECDIR --- src/config.h.in | 1 + src/resolversmodel.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/config.h.in b/src/config.h.in index 6d1385f72..ce0963ecd 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -9,6 +9,7 @@ #cmakedefine DEBUG_BUILD #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" +#define CMAKE_INSTALL_LIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}" #define CMAKE_SYSTEM "${CMAKE_SYSTEM}" #cmakedefine LION diff --git a/src/resolversmodel.cpp b/src/resolversmodel.cpp index 507872660..60d2c12a3 100644 --- a/src/resolversmodel.cpp +++ b/src/resolversmodel.cpp @@ -197,12 +197,13 @@ ResolversModel::addInstalledResolvers() QDir appDir( qApp->applicationDirPath() ); QDir libDir( CMAKE_INSTALL_PREFIX "/lib" ); + QDir libexecDir( CMAKE_INSTALL_LIBEXECDIR ); QDir lib64Dir( appDir ); lib64Dir.cdUp(); lib64Dir.cd( "lib64" ); - pluginDirs << appDir << libDir << lib64Dir << QDir( qApp->applicationDirPath() ); + pluginDirs << appDir << libDir << lib64Dir << libexecDir << QDir( qApp->applicationDirPath() ); foreach ( const QDir& pluginDir, pluginDirs ) { qDebug() << "Checking directory for resolvers:" << pluginDir;