[vlc-devel] commit: Fix phonon-vlc compilation and linking. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Tue Jan 19 14:08:27 2010 +0100| [45141762554b2cf5247d7bc6a7d88fdd762d27c4] | committer: Rémi Duraffort 

Fix phonon-vlc compilation and linking.

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=45141762554b2cf5247d7bc6a7d88fdd762d27c4
---

 bindings/phonon/CMakeLists.txt                  |    1 +
 bindings/phonon/cmake/modules/FindVLC.cmake     |    1 +
 bindings/phonon/{vlc-kde => vlc}/CMakeLists.txt |    0 
 3 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/bindings/phonon/CMakeLists.txt b/bindings/phonon/CMakeLists.txt
index 5f95f71..ad5dcc7 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 5d2b379..eec5c57 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