improved cmake scripts

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@373 90c681e8-e032-0410-971d-27865f9a5e38

5 files changed, 23 insertions, 67 deletions

diff --git a/src/plugins/Output/CMakeLists.txt b/src/plugins/Output/CMakeLists.txt
index 38f2629ee..9bd11aea8 100644
--- a/src/plugins/Output/CMakeLists.txt
+++ b/src/plugins/Output/CMakeLists.txt
@@ -4,29 +4,17 @@ SET(USE_OSS TRUE CACHE BOOL "enable/disable oss plugin")
 SET(USE_PULSE TRUE CACHE BOOL "enable/disable pulse audio plugin")
 
 IF(USE_ALSA)
-MESSAGE( STATUS "ALSA ON")
 add_subdirectory(alsa)
-ELSE(USE_ALSA)
-MESSAGE( STATUS "ALSA OFF")
 ENDIF(USE_ALSA)
 
 IF(USE_JACK)
-MESSAGE( STATUS "JACK ON")
 add_subdirectory(jack)
-ELSE(USE_JACK)
-MESSAGE( STATUS "JACK OFF")
 ENDIF(USE_JACK)
 
 IF(USE_OSS)
-MESSAGE( STATUS "OSS ON")
 add_subdirectory(oss)
-ELSE(USE_OSS)
-MESSAGE( STATUS "OSS OFF")
 ENDIF(USE_OSS)
 
 IF(USE_PULSE)
-MESSAGE( STATUS "PULSE AUDIO ON")
 add_subdirectory(pulseaudio)
-ELSE(USE_PULSE)
-MESSAGE( STATUS "PULSE AUDIO OFF")
 ENDIF(USE_PULSE)
diff --git a/src/plugins/Output/alsa/CMakeLists.txt b/src/plugins/Output/alsa/CMakeLists.txt
index 55efff100..c8f618240 100644
--- a/src/plugins/Output/alsa/CMakeLists.txt
+++ b/src/plugins/Output/alsa/CMakeLists.txt
@@ -2,9 +2,6 @@ project(libalsa)
 
 cmake_minimum_required(VERSION 2.4.0)
 
-
-INCLUDE(UsePkgConfig)
-
 # qt plugin
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
@@ -25,11 +22,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # alsa
-PKGCONFIG(alsa ALSA_INCLUDE_DIR ALSA_LINK_DIR ALSA_LINK_FLAGS ALSA_CFLAGS)
-
-IF(NOT ALSA_LINK_FLAGS)
-  SET(ALSA_LINK_FLAGS -lasound)
-ENDIF(NOT ALSA_LINK_FLAGS)
+pkg_search_module(ALSA alsa)
+include_directories(${ALSA_INCLUDE_DIRS})
+link_directories(${ALSA_LIBRARY_DIRS})
 
 SET(libalsa_SRCS
   outputalsa.cpp
@@ -61,8 +56,10 @@ QT4_WRAP_UI(libalsa_UIS_H ${libalsa_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
+IF(ALSA_FOUND)
 ADD_LIBRARY(alsa SHARED ${libalsa_SRCS} ${libalsa_MOC_SRCS} ${libalsa_UIS_H}
   ${libalsa_RCC_SRCS})
-target_link_libraries(alsa ${QT_LIBRARIES} -lqmmp ${ALSA_LINK_FLAGS})
-install(TARGETS alsa DESTINATION ${LIB_DIR}/qmmp/Output PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE  GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
+target_link_libraries(alsa ${QT_LIBRARIES} -lqmmp ${ALSA_LDFLAGS} ${ALSA_CFLAGS})
+install(TARGETS alsa DESTINATION ${LIB_DIR}/qmmp/Output)
+ENDIF(ALSA_FOUND)
 
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)
 
diff --git a/src/plugins/Output/oss/CMakeLists.txt b/src/plugins/Output/oss/CMakeLists.txt
index bbaf21ff3..2ff8fb1f7 100644
--- a/src/plugins/Output/oss/CMakeLists.txt
+++ b/src/plugins/Output/oss/CMakeLists.txt
@@ -2,9 +2,6 @@ project(liboss)
 
 cmake_minimum_required(VERSION 2.4.0)
 
-
-INCLUDE(UsePkgConfig)
-
 # qt plugin
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
@@ -25,14 +22,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 
-
-include_directories(${JACK_INCLUDE_DIR} ${JACK_INCLUDE_DIR})
-link_directories(${SAMPLERATE_LINK_DIR} ${SAMPLERATE_LINK_DIR})
-
-ADD_DEFINITIONS(${JACK_CFLAGS})
-ADD_DEFINITIONS(${SAMPLERATE_CFLAGS})
-
-
 SET(liboss_SRCS
   outputossfactory.cpp
   outputoss.cpp
@@ -59,6 +48,6 @@ QT4_WRAP_UI(liboss_UIS_H ${liboss_UIS})
 
 ADD_LIBRARY(oss SHARED ${liboss_SRCS} ${liboss_MOC_SRCS} ${liboss_UIS_H}
   ${liboss_RCC_SRCS})
-target_link_libraries(oss ${QT_LIBRARIES} -lqmmp )
-install(TARGETS oss DESTINATION ${LIB_DIR}/qmmp/Output PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE  GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
+target_link_libraries(oss ${QT_LIBRARIES} -lqmmp)
+install(TARGETS oss DESTINATION ${LIB_DIR}/qmmp/Output)
 
diff --git a/src/plugins/Output/pulseaudio/CMakeLists.txt b/src/plugins/Output/pulseaudio/CMakeLists.txt
index 30d9c2f87..219ea2dd8 100644
--- a/src/plugins/Output/pulseaudio/CMakeLists.txt
+++ b/src/plugins/Output/pulseaudio/CMakeLists.txt
@@ -2,9 +2,6 @@ project(libpulseaudio)
 
 cmake_minimum_required(VERSION 2.4.0)
 
-
-INCLUDE(UsePkgConfig)
-
 # qt plugin
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
@@ -25,11 +22,10 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # pulseaudio
-PKGCONFIG(libpulse-simple PULSE_INCLUDE_DIR PULSE_LINK_DIR PULSE_LINK_FLAGS PULSE_CFLAGS)
+pkg_check_modules(PULSE libpulse-simple)
 
-IF(NOT PULSE_LINK_FLAGS)
-  SET(PULSE_LINK_FLAGS -lpulse -lpulse-simple)
-ENDIF(NOT PULSE_LINK_FLAGS)
+include_directories(${PULSE_INCLUDE_DIRS})
+link_directories(${PULSE_LIBRARY_DIRS})
 
 SET(libpulseaudio_SRCS
   outputpulseaudio.cpp
@@ -52,8 +48,10 @@ QT4_WRAP_CPP(libpulseaudio_MOC_SRCS ${libpulseaudio_MOC_HDRS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
+IF(PULSE_FOUND)
 ADD_LIBRARY(pulseaudio SHARED ${libpulseaudio_SRCS} ${libpulseaudio_MOC_SRCS} ${libpulseaudio_UIS_H}
   ${libpulseaudio_RCC_SRCS})
-target_link_libraries(pulseaudio ${QT_LIBRARIES} -lqmmp ${PULSE_LINK_FLAGS})
+target_link_libraries(pulseaudio ${QT_LIBRARIES} -lqmmp ${PULSE_LDFLAGS} ${PULSE_CFLAGS})
 install(TARGETS pulseaudio DESTINATION ${LIB_DIR}/qmmp/Output)
+ENDIF(PULSE_FOUND)