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/Input/ffmpeg/CMakeLists.txt | 5 +++-- src/plugins/Input/flac/CMakeLists.txt | 5 +++-- src/plugins/Input/mad/CMakeLists.txt | 5 +++-- src/plugins/Input/modplug/CMakeLists.txt | 5 +++-- src/plugins/Input/mpc/CMakeLists.txt | 5 +++-- src/plugins/Input/sndfile/CMakeLists.txt | 5 +++-- src/plugins/Input/vorbis/CMakeLists.txt | 5 +++-- src/plugins/Input/wavpack/CMakeLists.txt | 5 +++-- 8 files changed, 24 insertions(+), 16 deletions(-) (limited to 'src/plugins/Input') 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) diff --git a/src/plugins/Input/flac/CMakeLists.txt b/src/plugins/Input/flac/CMakeLists.txt index 3b0defd1c..9e41e52f7 100644 --- a/src/plugins/Input/flac/CMakeLists.txt +++ b/src/plugins/Input/flac/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}/../../../ ) # libqmmp -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # libflac @@ -68,6 +68,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FLAC_FOUND) ADD_LIBRARY(flac SHARED ${libflac_SRCS} ${libflac_MOC_SRCS} ${libflac_UIS_H} ${libflac_RCC_SRCS}) +add_dependencies(flac qmmp) target_link_libraries(flac ${QT_LIBRARIES} -lqmmp ${FLAC_LDFLAGS} ${FLAC_CFLAGS} ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS}) install(TARGETS flac DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FLAC_FOUND) diff --git a/src/plugins/Input/mad/CMakeLists.txt b/src/plugins/Input/mad/CMakeLists.txt index 6edc6b448..4f258d578 100644 --- a/src/plugins/Input/mad/CMakeLists.txt +++ b/src/plugins/Input/mad/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}/../../../ ) # libqmmp -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # libmad @@ -69,6 +69,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MAD_FOUND) ADD_LIBRARY(mad SHARED ${libmad_SRCS} ${libmad_MOC_SRCS} ${libmad_UIS_H} ${libmad_RCC_SRCS}) +add_dependencies(mad qmmp) target_link_libraries(mad ${QT_LIBRARIES} -lqmmp ${MAD_LDFLAGS} ${MAD_CFLAGS} ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS}) install(TARGETS mad DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(MAD_FOUND) diff --git a/src/plugins/Input/modplug/CMakeLists.txt b/src/plugins/Input/modplug/CMakeLists.txt index be787010d..e4abe5f2b 100644 --- a/src/plugins/Input/modplug/CMakeLists.txt +++ b/src/plugins/Input/modplug/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}/../../../ ) # libqmmp -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # modplug @@ -70,6 +70,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MODPLUG_FOUND) ADD_LIBRARY(modplug SHARED ${libmodplug_SRCS} ${libmodplug_MOC_SRCS} ${libmodplug_UIS_H} ${libmodplug_RCC_SRCS}) +add_dependencies(modplug qmmp) target_link_libraries(modplug ${QT_LIBRARIES} -lqmmp ${MODPLUG_LDFLAGS} ${MODPLUG_CFLAGS}) install(TARGETS modplug DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(MODPLUG_FOUND) diff --git a/src/plugins/Input/mpc/CMakeLists.txt b/src/plugins/Input/mpc/CMakeLists.txt index 98df51016..942833edd 100644 --- a/src/plugins/Input/mpc/CMakeLists.txt +++ b/src/plugins/Input/mpc/CMakeLists.txt @@ -20,11 +20,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) # libmpc @@ -67,6 +67,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MPC_FOUND) ADD_LIBRARY(mpc SHARED ${libmpc_SRCS} ${libmpc_MOC_SRCS} ${libmpc_UIS_H} ${libmpc_RCC_SRCS}) +add_dependencies(mpc qmmp) target_link_libraries(mpc ${QT_LIBRARIES} -lqmmp -lmpcdec ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS}) install(TARGETS mpc DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(MPC_FOUND) diff --git a/src/plugins/Input/sndfile/CMakeLists.txt b/src/plugins/Input/sndfile/CMakeLists.txt index 840629b41..9d66df668 100644 --- a/src/plugins/Input/sndfile/CMakeLists.txt +++ b/src/plugins/Input/sndfile/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) # libsndfile @@ -55,6 +55,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(SNDFILE_FOUND) ADD_LIBRARY(sndfile SHARED ${libsndfile_SRCS} ${libsndfile_MOC_SRCS} ${libsndfile_UIS_H} ${libsndfile_RCC_SRCS}) +add_dependencies(sndfile qmmp) target_link_libraries(sndfile ${QT_LIBRARIES} -lqmmp ${SNDFILE_LDFLAGS} ${SNDFILE_CFLAGS}) install(TARGETS sndfile DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(SNDFILE_FOUND) diff --git a/src/plugins/Input/vorbis/CMakeLists.txt b/src/plugins/Input/vorbis/CMakeLists.txt index 9aa209cec..56f41ef0c 100644 --- a/src/plugins/Input/vorbis/CMakeLists.txt +++ b/src/plugins/Input/vorbis/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) # libvorbis and taglib @@ -64,6 +64,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(VORBIS_FOUND) ADD_LIBRARY(vorbis SHARED ${libvorbis_SRCS} ${libvorbis_MOC_SRCS} ${libvorbis_UIS_H} ${libvorbis_RCC_SRCS}) +add_dependencies(vorbis qmmp) target_link_libraries(vorbis ${QT_LIBRARIES} -lqmmp ${VORBIS_LDFLAGS} ${VORBIS_CFLAGS} ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS}) install(TARGETS vorbis DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(VORBIS_FOUND) diff --git a/src/plugins/Input/wavpack/CMakeLists.txt b/src/plugins/Input/wavpack/CMakeLists.txt index 8257620cb..675509921 100644 --- a/src/plugins/Input/wavpack/CMakeLists.txt +++ b/src/plugins/Input/wavpack/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) # wavpack @@ -64,6 +64,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(WAVPACK_FOUND) ADD_LIBRARY(wavpack SHARED ${libwavpack_SRCS} ${libwavpack_MOC_SRCS} ${libwavpack_UIS_H} ${libwavpack_RCC_SRCS}) +add_dependencies(wavpack qmmp) target_link_libraries(wavpack ${QT_LIBRARIES} -lqmmp ${WAVPACK_LDFLAGS} ${WAVPACK_CLAGS}) install(TARGETS wavpack DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(WAVPACK_FOUND) -- cgit v1.2.3-13-gbd6f