From 66f6d57a08972314ede4efd3e3eec583ff1d1bb0 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 2 Sep 2008 19:25:46 +0000 Subject: imported 0.2 fixes git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@540 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/PlaylistFormats/m3u/CMakeLists.txt | 5 +++-- src/plugins/PlaylistFormats/pls/CMakeLists.txt | 5 +++-- src/plugins/PlaylistFormats/xspf/CMakeLists.txt | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) (limited to 'src/plugins/PlaylistFormats') diff --git a/src/plugins/PlaylistFormats/m3u/CMakeLists.txt b/src/plugins/PlaylistFormats/m3u/CMakeLists.txt index a76efbb06..9b97df761 100644 --- a/src/plugins/PlaylistFormats/m3u/CMakeLists.txt +++ b/src/plugins/PlaylistFormats/m3u/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(libm3uplaylistformat_SRCS @@ -44,5 +44,6 @@ QT4_WRAP_CPP(libm3uplaylistformat_MOC_SRCS ${libm3uplaylistformat_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(m3uplaylistformat SHARED ${libm3uplaylistformat_SRCS} ${libm3uplaylistformat_MOC_SRCS}) +add_dependencies(m3uplaylistformat qmmpui) target_link_libraries(m3uplaylistformat ${QT_LIBRARIES} -lqmmpui) install(TARGETS m3uplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlaylistFormats) diff --git a/src/plugins/PlaylistFormats/pls/CMakeLists.txt b/src/plugins/PlaylistFormats/pls/CMakeLists.txt index 6b2383be0..ac9b55eec 100644 --- a/src/plugins/PlaylistFormats/pls/CMakeLists.txt +++ b/src/plugins/PlaylistFormats/pls/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(libplsplaylistformat_SRCS @@ -44,5 +44,6 @@ QT4_WRAP_CPP(libplsplaylistformat_MOC_SRCS ${libplsplaylistformat_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(plsplaylistformat SHARED ${libplsplaylistformat_SRCS} ${libplsplaylistformat_MOC_SRCS}) +add_dependencies(plsplaylistformat qmmpui) target_link_libraries(plsplaylistformat ${QT_LIBRARIES} -lqmmpui) install(TARGETS plsplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlaylistFormats) diff --git a/src/plugins/PlaylistFormats/xspf/CMakeLists.txt b/src/plugins/PlaylistFormats/xspf/CMakeLists.txt index 2d1a3986c..f71e09782 100644 --- a/src/plugins/PlaylistFormats/xspf/CMakeLists.txt +++ b/src/plugins/PlaylistFormats/xspf/CMakeLists.txt @@ -23,11 +23,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(libxspfplaylistformat_SRCS @@ -48,5 +48,6 @@ QT4_WRAP_CPP(libxspfplaylistformat_MOC_SRCS ${libxspfplaylistformat_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(xspfplaylistformat SHARED ${libxspfplaylistformat_SRCS} ${libxspfplaylistformat_MOC_SRCS}) +add_dependencies(xspfplaylistformat qmmpui) target_link_libraries(xspfplaylistformat ${QT_LIBRARIES} -lqmmpui) install(TARGETS xspfplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlaylistFormats) -- cgit v1.2.3-13-gbd6f