Optimiced Code

svn path=/trunk/KDE/kdelibs/; revision=918830

1 files changed, 30 insertions, 28 deletions

diff --git a/modules/FindPulseAudio.cmake b/modules/FindPulseAudio.cmake
index c9689219..057d1c29 100644
--- a/modules/FindPulseAudio.cmake
+++ b/modules/FindPulseAudio.cmake
@@ -8,6 +8,7 @@
 #  PULSEAUDIO_MAINLOOP_LIBRARY - the libraries needed to use PulsAudio Mailoop
 #
 # Copyright (c) 2008, Matthias Kretz, <kretz@kde.org>
+# Copyright (c) 2009, Marcus Hufgard, <Marcus.Hufgard@hufgard.de>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -23,44 +24,45 @@ endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY AND PULSEAUDIO_MAINLOOP_LIB
 
 if (NOT WIN32)
    include(FindPkgConfig)
-   pkg_check_modules(PULSEAUDIO libpulse>=${PULSEAUDIO_MINIMUM_VERSION})
-   if(PULSEAUDIO_FOUND)
-      set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library")
-      set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes")
-      #  PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio
-      #  set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS})
-      pkg_check_modules(PULSEAUDIO_MAINLOOP libpulse-mainloop-glib)
-      if(PULSEAUDIO_MAINLOOP_FOUND)
-          set(PULSEAUDIO_MAINLOOP_LIBRARY ${PULSEAUDIO_MAINLOOP_LIBRARIES} CACHE FILEPATH "Path to the PulsAudio Mainloop library")
-      endif(PULSEAUDIO_MAINLOOP_FOUND)
-   endif(PULSEAUDIO_FOUND)
-else (NOT WIN32)
+   pkg_check_modules(PC_PULSEAUDIO libpulse>=${PULSEAUDIO_MINIMUM_VERSION})
+   pkg_check_modules(PC_PULSEAUDIO_MAINLOOP libpulse-mainloop-glib)
+endif (NOT WIN32)
 
-  if (NOT PULSEAUDIO_INCLUDE_DIR)
-     FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h)
-  endif (NOT PULSEAUDIO_INCLUDE_DIR)
+FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h
+   HINTS
+   ${PC_PULSEADUIO_INCLUDEDIR}
+   ${PC_PULSEADUIO_INCLUDE_DIRS}
+   )
 
-  if (NOT PULSEAUDIO_LIBRARY)
-     FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse)
-  endif (NOT PULSEAUDIO_LIBRARY)
+FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse libpulse 
+   HINTS
+   ${PC_PULSEAUDIO_LIBDIR}
+   ${PC_PULSEAUDIO_LIBRARY_DIRS}
+   )
+
+FIND_LIBRARY(PULSEAUDIO_MAINLOOP_LIBRARY NAMES pulse-mainloop pulse-mainloop-glib libpulse-mainloop-glib
+   HINTS
+   ${PC_PULSEAUDIO_LIBDIR}
+   ${PC_PULSEAUDIO_LIBRARY_DIRS}
+   )
+
+if (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
+   set(PULSEAUDIO_FOUND TRUE)
+else (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
+   set(PULSEAUDIO_FOUND FALSE)
+endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
 
-  if (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
-     set(PULSEAUDIO_FOUND TRUE)
-  else (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
-     set(PULSEAUDIO_FOUND FALSE)
-  endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
-endif( NOT WIN32)
 if (PULSEAUDIO_FOUND)
    if (NOT PULSEAUDIO_FIND_QUIETLY)
       message(STATUS "Found PulseAudio: ${PULSEAUDIO_LIBRARY}")
-      if (PULSEAUDIO_MAINLOOP_FOUND)
+      if (PULSEAUDIO_MAINLOOP_LIBRARY)
           message(STATUS "Found PulseAudio Mainloop: ${PULSEAUDIO_MAINLOOP_LIBRARY}")
-      else (PULSAUDIO_MAINLOOP_FOUND)
+      else (PULSAUDIO_MAINLOOP_LIBRARY)
           message(STATUS "Could NOT find PulseAudio Mainloop Library")
-      endif (PULSEAUDIO_MAINLOOP_FOUND)
+      endif (PULSEAUDIO_MAINLOOP_LIBRARY)
    endif (NOT PULSEAUDIO_FIND_QUIETLY)
 else (PULSEAUDIO_FOUND)
    message(STATUS "Could NOT find PulseAudio")
 endif (PULSEAUDIO_FOUND)
 
-#mark_as_advanced(PULSEAUDIO_INCLUDE_DIR PULSEAUDIO_LIBRARY PULSEAUDIO_MAINLOOP_LIBRARY)
+mark_as_advanced(PULSEAUDIO_INCLUDE_DIR PULSEAUDIO_LIBRARY PULSEAUDIO_MAINLOOP_LIBRARY)