diff options
| -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}/../../../) |