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/Input/ffmpeg/CMakeLists.txt | |
| 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/Input/ffmpeg/CMakeLists.txt')
| -rw-r--r-- | src/plugins/Input/ffmpeg/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index a0506cb12..846fd66fe 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -21,11 +21,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) # libffmpeg @@ -93,6 +93,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FFMPEG_FOUND) ADD_LIBRARY(ffmpeg SHARED ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H} ${libffmpeg_RCC_SRCS}) +add_dependencies(ffmpeg qmmp) target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${FFMPEG_LDFLAGS} ${FFMPEG_CFLAGS}) install(TARGETS ffmpeg DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FFMPEG_FOUND) |