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/Output/jack/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/plugins/Output/jack') diff --git a/src/plugins/Output/jack/CMakeLists.txt b/src/plugins/Output/jack/CMakeLists.txt index 58bbfb6c8..52534f2ba 100644 --- a/src/plugins/Output/jack/CMakeLists.txt +++ b/src/plugins/Output/jack/CMakeLists.txt @@ -18,11 +18,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) SET(QT_INCLUDES ${QT_INCLUDES} - ${CMAKE_CURRENT_BINARY_DIR}/../../../ + ${CMAKE_CURRENT_SOURCE_DIR}/../../../ ) # libqmmp -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # libjack and samplerate @@ -52,6 +52,7 @@ QT4_WRAP_CPP(libjack_MOC_SRCS ${libjack_MOC_HDRS}) IF(JACK_FOUND) ADD_LIBRARY(jack SHARED ${libjack_SRCS} ${libjack_MOC_SRCS} ${libjack_RCC_SRCS}) +add_dependencies(jack qmmp) target_link_libraries(jack ${QT_LIBRARIES} -lqmmp ${JACK_LDFLAGS} ${JACK_CFLAGS}) install(TARGETS jack DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(JACK_FOUND) -- cgit v1.2.3-13-gbd6f