From d787dda4d47786a4e756f04bff8693f653e8bb85 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 15 May 2008 21:37:22 +0000 Subject: improved cmake scripts git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@373 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/wavpack/CMakeLists.txt | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'src/plugins/Input/wavpack') diff --git a/src/plugins/Input/wavpack/CMakeLists.txt b/src/plugins/Input/wavpack/CMakeLists.txt index 1fbd9adb0..a020955d0 100644 --- a/src/plugins/Input/wavpack/CMakeLists.txt +++ b/src/plugins/Input/wavpack/CMakeLists.txt @@ -2,9 +2,6 @@ project(libwavpack) cmake_minimum_required(VERSION 2.4.0) - -INCLUDE(UsePkgConfig) - # qt plugin ADD_DEFINITIONS( -Wall ) ADD_DEFINITIONS(${QT_DEFINITIONS}) @@ -24,19 +21,11 @@ SET(QT_INCLUDES include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) -# wavpack -PKGCONFIG(wavpack WAVPACK_INCLUDE_DIR WAVPACK_LINK_DIR WAVPACK_LINK_FLAGS WAVPACK_CFLAGS) +# wavpack +pkg_search_module(WAVPACK wavpack) -IF(NOT WAVPACK_LINK_FLAGS) - SET(WAVPACK_LINK_FLAGS -lwavpack -lm) - SET(WAVPACK_INCLUDE_DIR /usr/include) - SET(WAVPACK_CFLAGS -I/usr/include) - SET(WAVPACK_LINK_DIR /usr/lib) -ENDIF(NOT WAVPACK_LINK_FLAGS) - -ADD_DEFINITIONS(${WAVPACK_CFLAGS}) -include_directories(${CWAVPACK_INCLUDE_DIR}) -link_directories(${WAVPACK_LINK_DIR}) +include_directories(${CWAVPACK_INCLUDE_DIRS}) +link_directories(${WAVPACK_LIBRARY_DIRS}) SET(libwavpack_SRCS decoder_wavpack.cpp @@ -68,9 +57,10 @@ QT4_WRAP_UI(libwavpack_UIS_H ${libwavpack_UIS}) # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) +IF(WAVPACK_FOUND) ADD_LIBRARY(wavpack SHARED ${libwavpack_SRCS} ${libwavpack_MOC_SRCS} ${libwavpack_UIS_H} ${libwavpack_RCC_SRCS}) -target_link_libraries(wavpack ${QT_LIBRARIES} -lqmmp ${WAVPACK_LINK_FLAGS} ${WAVPACK_CLAGS}) +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