diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-02-09 20:35:27 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-02-09 20:35:27 +0000 |
| commit | 999b2065da19260e1f3e6644de9200101814e636 (patch) | |
| tree | 53abd49b28161d341389f8feae6cd3daf5f26a6f /src/plugins | |
| parent | f360d9de6ff14a66e327f6d2c985a4327be4019b (diff) | |
| download | qmmp-999b2065da19260e1f3e6644de9200101814e636.tar.gz qmmp-999b2065da19260e1f3e6644de9200101814e636.tar.bz2 qmmp-999b2065da19260e1f3e6644de9200101814e636.zip | |
fixed dbus plugin build
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@237 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/General/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/General/dbuscontrol/CMakeLists.txt | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/General/CMakeLists.txt b/src/plugins/General/CMakeLists.txt index e4769ef9d..793d41401 100644 --- a/src/plugins/General/CMakeLists.txt +++ b/src/plugins/General/CMakeLists.txt @@ -4,7 +4,7 @@ SET(USE_STATICON TRUE CACHE BOOL "enable/disable status icon plugin") IF(USE_DBUS) MESSAGE(STATUS "DBUS ON") -#add_subdirectory(dbuscontrol) +add_subdirectory(dbuscontrol) ELSE(USE_DBUS) MESSAGE(STATUS "DBUS OFF") ENDIF(USE_DBUS) diff --git a/src/plugins/General/dbuscontrol/CMakeLists.txt b/src/plugins/General/dbuscontrol/CMakeLists.txt index 8d4765dd2..32a37db7b 100644 --- a/src/plugins/General/dbuscontrol/CMakeLists.txt +++ b/src/plugins/General/dbuscontrol/CMakeLists.txt @@ -1,8 +1,8 @@ project(libdbuscontrol) -cmake_minimum_required(VERSION 2.4.0) - +cmake_minimum_required(VERSION 2.4.8 FATAL_ERROR) +SET (QT_USE_QTDBUS TRUE) INCLUDE(FindQt4) @@ -17,14 +17,9 @@ ADD_DEFINITIONS(-DQT_NO_DEBUG) ADD_DEFINITIONS(-DQT_SHARED) ADD_DEFINITIONS(-DQT_THREAD) -SET(QT_USE_QTDBUS TRUE) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_BINARY_DIR}/../../../ -) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) # libqmmpui include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) |