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/Output/jack/CMakeLists.txt | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

(limited to 'src/plugins/Output/jack/CMakeLists.txt')

diff --git a/src/plugins/Output/jack/CMakeLists.txt b/src/plugins/Output/jack/CMakeLists.txt
index 423070ef7..1605c58f1 100644
--- a/src/plugins/Output/jack/CMakeLists.txt
+++ b/src/plugins/Output/jack/CMakeLists.txt
@@ -2,9 +2,6 @@ project(libjack)
 
 cmake_minimum_required(VERSION 2.4.0)
 
-
-INCLUDE(UsePkgConfig)
-
 # qt plugin
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
@@ -24,25 +21,11 @@ SET(QT_INCLUDES
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
-# libjack and taglib
-PKGCONFIG(jack JACK_INCLUDE_DIR JACK_LINK_DIR JACK_LINK_FLAGS JACK_CFLAGS)
-PKGCONFIG(samplerate SAMPLERATE_INCLUDE_DIR SAMPLERATE_LINK_DIR SAMPLERATE_LINK_FLAGS SAMPLERATE_CFLAGS)
-
-
-IF(NOT JACK_LINK_FLAGS)
-  SET(JACK_LINK_FLAGS -ljack -lrt)
-ENDIF(NOT JACK_LINK_FLAGS)
-
-IF(NOT SAMPLERATE_LINK_FLAGS)
-  SET(SAMPLERATE_LINK_FLAGS -lsamplerate)
-ENDIF(NOT SAMPLERATE_LINK_FLAGS)
-
-include_directories(${JACK_INCLUDE_DIR} ${JACK_INCLUDE_DIR})
-link_directories(${SAMPLERATE_LINK_DIR} ${SAMPLERATE_LINK_DIR})
-
-ADD_DEFINITIONS(${JACK_CFLAGS})
-ADD_DEFINITIONS(${SAMPLERATE_CFLAGS})
+# libjack and samplerate
+pkg_check_modules(JACK jack samplerate)
 
+include_directories(${JACK_INCLUDE_DIRS})
+link_directories(${JACK_LIBRARY_DIRS})
 
 SET(libjack_SRCS
   outputjackfactory.cpp
@@ -63,8 +46,9 @@ QT4_ADD_RESOURCES(libjack_RCC_SRCS ${libjack_RCCS})
 QT4_WRAP_CPP(libjack_MOC_SRCS ${libjack_MOC_HDRS})
 
 
-
+IF(JACK_FOUND)
 ADD_LIBRARY(jack SHARED ${libjack_SRCS} ${libjack_MOC_SRCS} ${libjack_RCC_SRCS})
-target_link_libraries(jack ${QT_LIBRARIES} -lqmmp ${JACK_LINK_FLAGS} ${SAMPLERATE_LINK_FLAGS})
-install(TARGETS jack DESTINATION ${LIB_DIR}/qmmp/Output PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE  GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
+target_link_libraries(jack ${QT_LIBRARIES} -lqmmp ${JACK_LDFLAGS} ${JACK_CFLAGS})
+install(TARGETS jack DESTINATION ${LIB_DIR}/qmmp/Output)
+ENDIF(JACK_FOUND)
 
-- 
cgit v1.2.3-13-gbd6f