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 5f95f714ba8ee2c5fd1579bf43470252987f86a9..ad5dcc76e5b8a5fc8aa18b4d1c240bc57c3101b2 100644 (file)
--- 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 5d2b379182ad2b6160849ed65e1b6fba6357a3d5..eec5c5709214963120af6e614a1ab3d4399c7638 100644 (file)
--- 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