From: Rémi Duraffort <ivoire@videolan.org>
Date: Tue, 19 Jan 2010 13:08:27 +0000 (+0100)
Subject: Fix phonon-vlc compilation and linking.
X-Git-Tag: 1.1.0-ff~1090
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=45141762554b2cf5247d7bc6a7d88fdd762d27c4;p=vlc

Fix phonon-vlc compilation and linking.

(not sure that's the best way but that's working well).
---

diff --git a/bindings/phonon/CMakeLists.txt b/bindings/phonon/CMakeLists.txt
index 5f95f714ba..ad5dcc76e5 100644
--- a/bindings/phonon/CMakeLists.txt
+++ b/bindings/phonon/CMakeLists.txt
@@ -30,6 +30,7 @@ find_package(Automoc4 REQUIRED)
 include (CheckCXXCompilerFlag)
 include (MacroEnsureVersion)
 
+find_package(VLC REQUIRED)
 if (NOT AUTOMOC4_VERSION)
    set(AUTOMOC4_VERSION "0.9.83")
 endif (NOT AUTOMOC4_VERSION)
diff --git a/bindings/phonon/cmake/modules/FindVLC.cmake b/bindings/phonon/cmake/modules/FindVLC.cmake
index 5d2b379182..eec5c57092 100644
--- a/bindings/phonon/cmake/modules/FindVLC.cmake
+++ b/bindings/phonon/cmake/modules/FindVLC.cmake
@@ -25,6 +25,7 @@ if(NOT WIN32)
   find_package(PkgConfig)
   pkg_check_modules(VLC libvlc>=1.0.0)
   set(VLC_DEFINITIONS ${VLC_CFLAGS})
+  set(VLC_LIBRARIES ${VLC_LDFLAGS})
 endif(NOT WIN32)
 
 # TODO add argument support to pass version on find_package
diff --git a/bindings/phonon/vlc-kde/CMakeLists.txt b/bindings/phonon/vlc/CMakeLists.txt
similarity index 100%
rename from bindings/phonon/vlc-kde/CMakeLists.txt
rename to bindings/phonon/vlc/CMakeLists.txt