cmake: improve libvlc detection

Changes made by phonon-vlc developers.

cmake/FindLIBVLC.cmake

@@ -18,37 +18,37 @@
 #Put here path to custom location
 #example: /home/user/vlc/include etc..
 FIND_PATH(LIBVLC_INCLUDE_DIR vlc/vlc.h
-  "$ENV{LIBVLC_INCLUDE_PATH}"
-  "$ENV{LIB_DIR}/include"
-  "$ENV{LIB_DIR}/include/vlc"
-  "/usr/include"
-  "/usr/include/vlc"
-  "/usr/local/include"
-  "/usr/local/include/vlc"
-  #mingw
-  c:/msys/local/include
-  NO_DEFAULT_PATH
+  HINTS "$ENV{LIBVLC_INCLUDE_PATH}"
+  PATHS
+    "$ENV{LIB_DIR}/include"
+    "$ENV{LIB_DIR}/include/vlc"
+    "/usr/include"
+    "/usr/include/vlc"
+    "/usr/local/include"
+    "/usr/local/include/vlc"
+    #mingw
+    c:/msys/local/include
   )
-FIND_PATH(LIBVLC_INCLUDE_DIR vlc.h)
+FIND_PATH(LIBVLC_INCLUDE_DIR PATHS "${CMAKE_INCLUDE_PATH}/vlc" NAMES vlc.h)
 
 #Put here path to custom location
 #example: /home/user/vlc/lib etc..
-FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc PATHS
-  "$ENV{LIBVLC_LIBRARY_PATH}"
-  "$ENV{LIB_DIR}/lib"
-  #mingw
-  c:/msys/local/lib
-  NO_DEFAULT_PATH
+FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc libvlc
+  HINTS "$ENV{LIBVLC_LIBRARY_PATH}"
+  PATHS
+    "$ENV{LIB_DIR}/lib"
+    #mingw
+    c:/msys/local/lib
   )
-FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc)
-FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore PATHS
-  "$ENV{LIBVLC_LIBRARY_PATH}"
-  "$ENV{LIB_DIR}/lib"
-  #mingw
-  c:/msys/local/lib
-  NO_DEFAULT_PATH
+FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc libvlc)
+FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore libvlccore
+  HINTS "$ENV{LIBVLC_LIBRARY_PATH}"
+  PATHS
+    "$ENV{LIB_DIR}/lib"
+    #mingw
+    c:/msys/local/lib
   )
-FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore)
+FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore libvlccore)
 
 IF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY)
    SET(LIBVLC_FOUND TRUE)
@@ -65,3 +65,4 @@ ELSE (LIBVLC_FOUND)
       MESSAGE(FATAL_ERROR "Could not find LibVLC")
    ENDIF (LIBVLC_FIND_REQUIRED)
 ENDIF (LIBVLC_FOUND)
+