From 5020bf83969392d03b7bdbd775a9b42fdf2a6b49 Mon Sep 17 00:00:00 2001
From: Marcus Hufgard <marcus.hufgard@hufgard.de>
Date: Wed, 14 Jan 2009 14:26:33 +0000
Subject: we need the PulseAudio Mainloop Library in kdemultimedia.

Please have a look over it and expand it to win32 libs.

Thanks

svn path=/trunk/KDE/kdelibs/; revision=910978
---
 modules/FindPulseAudio.cmake | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/FindPulseAudio.cmake b/modules/FindPulseAudio.cmake
index f9e5855f..c9689219 100644
--- a/modules/FindPulseAudio.cmake
+++ b/modules/FindPulseAudio.cmake
@@ -5,6 +5,7 @@
 #  PULSEAUDIO_FOUND - system has the PulseAudio library
 #  PULSEAUDIO_INCLUDE_DIR - the PulseAudio include directory
 #  PULSEAUDIO_LIBRARY - the libraries needed to use PulseAudio
+#  PULSEAUDIO_MAINLOOP_LIBRARY - the libraries needed to use PulsAudio Mailoop
 #
 # Copyright (c) 2008, Matthias Kretz, <kretz@kde.org>
 #
@@ -15,10 +16,10 @@ if (NOT PULSEAUDIO_MINIMUM_VERSION)
   set(PULSEAUDIO_MINIMUM_VERSION "0.9.9")
 endif (NOT PULSEAUDIO_MINIMUM_VERSION)
 
-if (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
+if (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY AND PULSEAUDIO_MAINLOOP_LIBRARY)
    # Already in cache, be silent
    set(PULSEAUDIO_FIND_QUIETLY TRUE)
-endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
+endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY AND PULSEAUDIO_MAINLOOP_LIBRARY)
 
 if (NOT WIN32)
    include(FindPkgConfig)
@@ -28,6 +29,10 @@ if (NOT WIN32)
       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)
 
@@ -48,9 +53,14 @@ endif( NOT WIN32)
 if (PULSEAUDIO_FOUND)
    if (NOT PULSEAUDIO_FIND_QUIETLY)
       message(STATUS "Found PulseAudio: ${PULSEAUDIO_LIBRARY}")
+      if (PULSEAUDIO_MAINLOOP_FOUND)
+          message(STATUS "Found PulseAudio Mainloop: ${PULSEAUDIO_MAINLOOP_LIBRARY}")
+      else (PULSAUDIO_MAINLOOP_FOUND)
+          message(STATUS "Could NOT find PulseAudio Mainloop Library")
+      endif (PULSEAUDIO_MAINLOOP_FOUND)
    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)
+#mark_as_advanced(PULSEAUDIO_INCLUDE_DIR PULSEAUDIO_LIBRARY PULSEAUDIO_MAINLOOP_LIBRARY)
-- 
cgit v1.2.1


From c43b051c975ef76f411342116053da84e0ee3cd3 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Sat, 17 Jan 2009 12:19:34 +0000
Subject: Fix create symlink

svn path=/trunk/KDE/kdelibs/; revision=912335
---
 modules/FindPyKDE4.cmake         |  6 +++++-
 modules/create_exe_symlink.cmake | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 modules/create_exe_symlink.cmake

diff --git a/modules/FindPyKDE4.cmake b/modules/FindPyKDE4.cmake
index f738741e..dd2b7380 100644
--- a/modules/FindPyKDE4.cmake
+++ b/modules/FindPyKDE4.cmake
@@ -156,5 +156,9 @@ ENDMACRO(PYKDE4_INSTALL_PYTHON_FILES)
 # executable.
 #
 MACRO(PYKDE4_ADD_EXECUTABLE _pyname _exename)
-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${DATA_INSTALL_DIR}/${PROJECT_NAME}/${_pyname} -DLINK_NAME=${BIN_INSTALL_DIR}/${_exename} -P ${CMAKE_SOURCE_DIR}/cmake/modules/create_exe_symlink.cmake)" )
+    if(NOT ${PROJECT_NAME})
+         MESSAGE(STATUS "Project name is necessary to create symlink against python program!!! It will failed.")
+    endif(NOT ${PROJECT_NAME})
+    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${DATA_INSTALL_DIR}/${PROJECT_NAME}/${_pyname} -DLINK_NAME=${BIN_INSTALL_DIR}/${_exename} -P ${current_module_dir}/create_exe_symlink.cmake)" )
 ENDMACRO(PYKDE4_ADD_EXECUTABLE)
+
diff --git a/modules/create_exe_symlink.cmake b/modules/create_exe_symlink.cmake
new file mode 100644
index 00000000..6f35ff76
--- /dev/null
+++ b/modules/create_exe_symlink.cmake
@@ -0,0 +1,16 @@
+# Create an executable symlink to a Python script.
+# This also sets the target script's permission bits.
+
+MESSAGE(STATUS "Symlinking $ENV{DESTDIR}/${LINK_NAME} to $ENV{DESTDIR}/${TARGET}")
+
+GET_FILENAME_COMPONENT(abs_link_name $ENV{DESTDIR}/${LINK_NAME} ABSOLUTE)
+GET_FILENAME_COMPONENT(link_path $ENV{DESTDIR}/${LINK_NAME} PATH)
+GET_FILENAME_COMPONENT(abs_link_path ${link_path} ABSOLUTE)
+FILE(MAKE_DIRECTORY ${abs_link_path})
+
+GET_FILENAME_COMPONENT(abs_target $ENV{DESTDIR}/${TARGET} ABSOLUTE)
+IF(UNIX)
+    EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${abs_target} ${abs_link_name})
+    EXECUTE_PROCESS(COMMAND chmod a+x ${abs_target})
+ENDIF(UNIX)
+# FIXME: WIN32 support
-- 
cgit v1.2.1