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/sndfile/CMakeLists.txt | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'src/plugins/Input/sndfile/CMakeLists.txt') diff --git a/src/plugins/Input/sndfile/CMakeLists.txt b/src/plugins/Input/sndfile/CMakeLists.txt index 3a660bf9d..630db0be3 100644 --- a/src/plugins/Input/sndfile/CMakeLists.txt +++ b/src/plugins/Input/sndfile/CMakeLists.txt @@ -2,12 +2,6 @@ project(libsndfile) cmake_minimum_required(VERSION 2.4.0) - -INCLUDE(UsePkgConfig) -#INCLUDE(FindQt4) - -#include(${QT_USE_FILE}) - # qt plugin ADD_DEFINITIONS( -Wall ) ADD_DEFINITIONS(${QT_DEFINITIONS}) @@ -28,19 +22,10 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # libsndfile -PKGCONFIG(sndfile SNDFILE_INCLUDE_DIR SNDFILE_LINK_DIR SNDFILE_LINK_FLAGS SNDFILE_CFLAGS) - -IF(NOT SNDFILE_LINK_FLAGS) - SET(SNDFILE_LINK_FLAGS -lsndfile) - SET(SNDFILE_INCLUDE_DIR /usr/include) - SET(SNDFILE_CFLAGS -I/usr/include) -ENDIF(NOT SNDFILE_LINK_FLAGS) - -include_directories(${SNDFILE_INCLUDE_DIR}) -link_directories(${SNDFILE_LINK_DIR}) - -ADD_DEFINITIONS(${SNDFILE_CFLAGS}) +pkg_search_module(SNDFILE sndfile) +include_directories(${SNDFILE_INCLUDE_DIRS}) +link_directories(${SNDFILE_LIBRARY_DIRS}) SET(libsndfile_SRCS decoder_sndfile.cpp @@ -63,11 +48,12 @@ QT4_WRAP_CPP(libsndfile_MOC_SRCS ${libsndfile_MOC_HDRS}) # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) +IF(SNDFILE_FOUND) ADD_LIBRARY(sndfile SHARED ${libsndfile_SRCS} ${libsndfile_MOC_SRCS} ${libsndfile_UIS_H} ${libsndfile_RCC_SRCS}) - -target_link_libraries(sndfile ${QT_LIBRARIES} -lqmmp ${SNDFILE_LINK_FLAGS}) +target_link_libraries(sndfile ${QT_LIBRARIES} -lqmmp ${SNDFILE_LDFLAGS} ${SNDFILE_CFLAGS}) install(TARGETS sndfile DESTINATION ${LIB_DIR}/qmmp/Input) +ENDIF(SNDFILE_FOUND) -- cgit v1.2.3-13-gbd6f