diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-09-02 19:25:46 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-09-02 19:25:46 +0000 |
| commit | 66f6d57a08972314ede4efd3e3eec583ff1d1bb0 (patch) | |
| tree | fe383671ac085071224128806d529ed5d67a3b0e /src/plugins/General | |
| parent | de0359b81556063c9c19fcfe76fdd21db655cd81 (diff) | |
| download | qmmp-66f6d57a08972314ede4efd3e3eec583ff1d1bb0.tar.gz qmmp-66f6d57a08972314ede4efd3e3eec583ff1d1bb0.tar.bz2 qmmp-66f6d57a08972314ede4efd3e3eec583ff1d1bb0.zip | |
imported 0.2 fixes
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@540 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General')
| -rw-r--r-- | src/plugins/General/dbuscontrol/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/General/notifier/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/plugins/General/scrobbler/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/plugins/General/statusicon/CMakeLists.txt | 5 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/plugins/General/dbuscontrol/CMakeLists.txt b/src/plugins/General/dbuscontrol/CMakeLists.txt index b57675368..9126a7964 100644 --- a/src/plugins/General/dbuscontrol/CMakeLists.txt +++ b/src/plugins/General/dbuscontrol/CMakeLists.txt @@ -25,7 +25,7 @@ ADD_DEFINITIONS(-DQT_THREAD) include_directories(${CMAKE_CURRENT_BINARY_DIR}) # libqmmpui -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) SET(libdbuscontrol_SRCS @@ -55,5 +55,6 @@ QT4_WRAP_CPP(libdbuscontrol_MOC_SRCS ${libdbuscontrol_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(dbuscontrol SHARED ${libdbuscontrol_SRCS} ${libdbuscontrol_MOC_SRCS} ${libdbuscontrol_RCC_SRCS}) +add_dependencies(dbuscontrol qmmpui) target_link_libraries(dbuscontrol ${QT_LIBRARIES} -lqmmpui) install(TARGETS dbuscontrol DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/notifier/CMakeLists.txt b/src/plugins/General/notifier/CMakeLists.txt index 6c29091ab..38f93319c 100644 --- a/src/plugins/General/notifier/CMakeLists.txt +++ b/src/plugins/General/notifier/CMakeLists.txt @@ -19,11 +19,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) SET(QT_INCLUDES ${QT_INCLUDES} - ${CMAKE_CURRENT_BINARY_DIR}/../../../ + ${CMAKE_CURRENT_SOURCE_DIR}/../../../ ) # libqmmpui -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) SET(libnotifier_SRCS @@ -61,5 +61,6 @@ QT4_WRAP_UI(libnotifier_UIS_H ${libnotifier_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(notifier SHARED ${libnotifier_SRCS} ${libnotifier_MOC_SRCS} ${libnotifier_UIS_H} ${libnotifier_RCC_SRCS}) +add_dependencies(notifier qmmpui) target_link_libraries(notifier ${QT_LIBRARIES} -lqmmpui) install(TARGETS notifier DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/scrobbler/CMakeLists.txt b/src/plugins/General/scrobbler/CMakeLists.txt index 4887f0aa9..5aa0cc773 100644 --- a/src/plugins/General/scrobbler/CMakeLists.txt +++ b/src/plugins/General/scrobbler/CMakeLists.txt @@ -25,11 +25,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) SET(QT_INCLUDES ${QT_INCLUDES} - ${CMAKE_CURRENT_BINARY_DIR}/../../../ + ${CMAKE_CURRENT_SOURCE_DIR}/../../../ ) # libqmmpui -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) SET(libscrobbler_SRCS @@ -64,5 +64,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(scrobbler SHARED ${libscrobbler_SRCS} ${libscrobbler_MOC_SRCS} ${libscrobbler_UIS_H} ${libscrobbler_RCC_SRCS}) +add_dependencies(scrobbler qmmpui) target_link_libraries(scrobbler ${QT_LIBRARIES} -lqmmpui) install(TARGETS scrobbler DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/statusicon/CMakeLists.txt b/src/plugins/General/statusicon/CMakeLists.txt index 6ebd8ae36..62f49700a 100644 --- a/src/plugins/General/statusicon/CMakeLists.txt +++ b/src/plugins/General/statusicon/CMakeLists.txt @@ -19,11 +19,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) SET(QT_INCLUDES ${QT_INCLUDES} - ${CMAKE_CURRENT_BINARY_DIR}/../../../ + ${CMAKE_CURRENT_SOURCE_DIR}/../../../ ) # libqmmpui -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) SET(libstatusicon_SRCS @@ -59,5 +59,6 @@ QT4_WRAP_UI(libstatusicon_UIS_H ${libstatusicon_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(statusicon SHARED ${libstatusicon_SRCS} ${libstatusicon_MOC_SRCS} ${libstatusicon_UIS_H} ${libstatusicon_RCC_SRCS}) +add_dependencies(statusicon qmmpui) target_link_libraries(statusicon ${QT_LIBRARIES} -lqmmpui) install(TARGETS statusicon DESTINATION ${LIB_DIR}/qmmp/General) |