mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 06:36:55 +02:00
Code Issues Releases Wiki Activity

Allow setting absolute paths in CMAKE_INSTALL_LIBEXECDIR

Browse Source
This commit is contained in:
Dominik Schmidt
2011-12-27 02:39:34 +01:00
parent a059cc2e18
commit a6a362944a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/breakpad/BreakPad.cpp
View File

@@ -82,14 +82,14 @@ BreakPad::BreakPad( const QString& path, bool active )
QString reporter; QString reporter;
QString localReporter = QString( "%1/%2" ).arg( qApp->applicationDirPath() ).arg( CRASH_REPORTER_BINARY ); QString localReporter = QString( "%1/%2" ).arg( qApp->applicationDirPath() ).arg( CRASH_REPORTER_BINARY );
QString globalReporter = QString( "%1/%2" ).arg( CMAKE_INSTALL_PREFIX "/" CMAKE_INSTALL_LIBEXECDIR ).arg( CRASH_REPORTER_BINARY ); QString globalReporter = QString( "%1/%2" ).arg( CMAKE_INSTALL_FULL_LIBEXECDIR ).arg( CRASH_REPORTER_BINARY );
if ( QFileInfo( localReporter ).exists() ) if ( QFileInfo( localReporter ).exists() )
reporter = localReporter; reporter = localReporter;
else if ( QFileInfo( globalReporter ).exists() ) else if ( QFileInfo( globalReporter ).exists() )
reporter = globalReporter; reporter = globalReporter;
else else
tLog() << "Could not find \"" CRASH_REPORTER_BINARY "\" in \"" CMAKE_INSTALL_PREFIX "/" CMAKE_INSTALL_LIBEXECDIR "\" or application path"; tLog() << "Could not find \"" CRASH_REPORTER_BINARY "\" in \"" CMAKE_INSTALL_FULL_LIBEXECDIR "\" or application path";
char* creporter; char* creporter;
std::string sreporter = reporter.toStdString(); std::string sreporter = reporter.toStdString();

2
src/config.h.in
View File

@@ -9,7 +9,7 @@
#cmakedefine DEBUG_BUILD #cmakedefine DEBUG_BUILD
#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
#define CMAKE_INSTALL_LIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}" #define CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}"
#define CMAKE_SYSTEM "${CMAKE_SYSTEM}" #define CMAKE_SYSTEM "${CMAKE_SYSTEM}"
#cmakedefine LION #cmakedefine LION

2
src/resolversmodel.cpp
View File

@@ -208,7 +208,7 @@ ResolversModel::addInstalledResolvers()
QDir appDir( qApp->applicationDirPath() ); QDir appDir( qApp->applicationDirPath() );
QDir libDir( CMAKE_INSTALL_PREFIX "/lib" ); QDir libDir( CMAKE_INSTALL_PREFIX "/lib" );
QDir libexecDir( CMAKE_INSTALL_LIBEXECDIR ); QDir libexecDir( CMAKE_INSTALL_FULL_LIBEXECDIR );
QDir lib64Dir( appDir ); QDir lib64Dir( appDir );
lib64Dir.cdUp(); lib64Dir.cdUp();