From d787dda4d47786a4e756f04bff8693f653e8bb85 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
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/Effect/CMakeLists.txt             |  3 ---
 src/plugins/Effect/srconverter/CMakeLists.txt | 20 ++++++--------------
 2 files changed, 6 insertions(+), 17 deletions(-)

(limited to 'src/plugins/Effect')

diff --git a/src/plugins/Effect/CMakeLists.txt b/src/plugins/Effect/CMakeLists.txt
index a777010b9..d2303428b 100644
--- a/src/plugins/Effect/CMakeLists.txt
+++ b/src/plugins/Effect/CMakeLists.txt
@@ -1,8 +1,5 @@
 SET(USE_SRC TRUE CACHE BOOL "enable/disable SRC plugin")
 
 IF(USE_SRC)
-MESSAGE( STATUS "SRC ON")
 add_subdirectory(srconverter)
-ELSE(USE_SRC)
-MESSAGE( STATUS "SRC OFF")
 ENDIF(USE_SRC)
diff --git a/src/plugins/Effect/srconverter/CMakeLists.txt b/src/plugins/Effect/srconverter/CMakeLists.txt
index b840f9143..401d9e3bd 100644
--- a/src/plugins/Effect/srconverter/CMakeLists.txt
+++ b/src/plugins/Effect/srconverter/CMakeLists.txt
@@ -2,9 +2,6 @@ project(libsrconverter)
 
 cmake_minimum_required(VERSION 2.4.0)
 
-
-INCLUDE(UsePkgConfig)
-
 # qt plugin
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
@@ -24,16 +21,10 @@ SET(QT_INCLUDES
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
-PKGCONFIG(samplerate SAMPLERATE_INCLUDE_DIR SAMPLERATE_LINK_DIR SAMPLERATE_LINK_FLAGS SAMPLERATE_CFLAGS)
-
-IF(NOT SAMPLERATE_LINK_FLAGS)
-  SET(SAMPLERATE_LINK_FLAGS -lsamplerate)
-ENDIF(NOT SAMPLERATE_LINK_FLAGS)
+pkg_check_modules(SAMPLERATE samplerate)
 
-include_directories(${SAMPLERATE_INCLUDE_DIR})
-link_directories(${SAMPLERATE_LINK_DIR})
-
-ADD_DEFINITIONS(${SAMPLERATE_CFLAGS})
+include_directories(${SAMPLERATE_INCLUDE_DIRS})
+link_directories(${SAMPLERATE_LIBRARY_DIRS})
 
 SET(libsrconverter_SRCS
     srconverter.cpp
@@ -65,8 +56,9 @@ QT4_WRAP_UI(libsrconverter_UIS_H ${libsrconverter_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
+IF(SAMPLERATE_FOUND)
 ADD_LIBRARY(srconverter SHARED ${libsrconverter_SRCS} ${libsrconverter_MOC_SRCS} ${libsrconverter_UIS_H}
   ${libsrconverter_RCC_SRCS})
-target_link_libraries(srconverter ${QT_LIBRARIES} -lqmmp ${SAMPLERATE_LINK_FLAGS})
+target_link_libraries(srconverter ${QT_LIBRARIES} -lqmmp ${SAMPLERATE_LDFLAGS} ${SAMPLERATE_CFLAGS})
 install(TARGETS srconverter DESTINATION ${LIB_DIR}/qmmp/Effect)
-
+ENDIF(SAMPLERATE_FOUND)
-- 
cgit v1.2.3-13-gbd6f