CMake: Fix Find modules lookup (use HINTS instead of PATHS)

The documentation says that PATHS has lower priority than the standard
system environment variables.

Use HINTS to lookup the directories from pkg-config at first.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40008

6 files changed, 27 insertions, 24 deletions

diff --git a/cmake/modules/FindDBus.cmake b/cmake/modules/FindDBus.cmake
index f8379e78..16d20baf 100644
--- a/cmake/modules/FindDBus.cmake
+++ b/cmake/modules/FindDBus.cmake
@@ -21,18 +21,20 @@ if (NOT WIN32)
 endif ()
 
 find_path(DBUS_INCLUDE_DIR dbus/dbus.h
-    PATHS ${PC_DBUS_INCLUDE_DIRS}
+    HINTS
+        ${PC_DBUS_INCLUDE_DIRS}
     PATH_SUFFIXES dbus-1.0
 )
 
 find_path(DBUS_ARCH_INCLUDE_DIR dbus/dbus-arch-deps.h
-    PATHS ${PC_DBUS_INCLUDE_DIRS}
-    HINTS ${CMAKE_LIBRARY_PATH}/dbus-1.0/include
-          ${CMAKE_SYSTEM_LIBRARY_PATH}/dbus-1.0/include
+    HINTS
+        ${PC_DBUS_INCLUDE_DIRS}
+        ${CMAKE_LIBRARY_PATH}/dbus-1.0/include
+        ${CMAKE_SYSTEM_LIBRARY_PATH}/dbus-1.0/include
 )
 
 find_library(DBUS_LIBRARIES NAMES dbus-1
-    PATHS ${PC_DBUS_LIBRARY_DIRS}
+    HINTS ${PC_DBUS_LIBRARY_DIRS}
 )
 
 include(FindPackageHandleStandardArgs)
diff --git a/cmake/modules/FindFarstream.cmake b/cmake/modules/FindFarstream.cmake
index 58b5c2cd..509a70f0 100644
--- a/cmake/modules/FindFarstream.cmake
+++ b/cmake/modules/FindFarstream.cmake
@@ -31,14 +31,14 @@ if (NOT WIN32)
 endif ()
 
 find_path(FARSTREAM_INCLUDE_DIR farstream/fs-conference.h
-   PATHS
+   HINTS
    ${PC_FARSTREAM_INCLUDEDIR}
    ${PC_FARSTREAM_INCLUDE_DIRS}
    PATH_SUFFIXES farstream-0.2
    )
 
 find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2
-   PATHS
+   HINTS
    ${PC_FARSTREAM_LIBDIR}
    ${PC_FARSTREAM_LIBRARY_DIRS}
    )
diff --git a/cmake/modules/FindGObject.cmake b/cmake/modules/FindGObject.cmake
index 72db6e5d..e5bbb119 100644
--- a/cmake/modules/FindGObject.cmake
+++ b/cmake/modules/FindGObject.cmake
@@ -26,26 +26,27 @@ IF (NOT WIN32)
 ENDIF ()
 
 FIND_PATH(GOBJECT_INCLUDE_DIR gobject/gobject.h
-   PATHS
-   ${PKG_GOBJECT2_INCLUDE_DIRS}
-   /usr/include/glib-2.0/
-   PATH_SUFFIXES glib-2.0
-   )
+    HINTS
+    ${PKG_GOBJECT2_INCLUDE_DIRS}
+    PATHS
+    /usr/include/glib-2.0/
+    PATH_SUFFIXES glib-2.0
+)
 
 FIND_LIBRARY(_GObjectLibs NAMES gobject-2.0
-   PATHS
+   HINTS
    ${PKG_GOBJECT2_LIBRARY_DIRS}
    )
 FIND_LIBRARY(_GModuleLibs NAMES gmodule-2.0
-   PATHS
+   HINTS
    ${PKG_GOBJECT2_LIBRARY_DIRS}
    )
 FIND_LIBRARY(_GThreadLibs NAMES gthread-2.0
-   PATHS
+   HINTS
    ${PKG_GOBJECT2_LIBRARY_DIRS}
    )
 FIND_LIBRARY(_GLibs NAMES glib-2.0
-   PATHS
+   HINTS
    ${PKG_GOBJECT2_LIBRARY_DIRS}
    )
 
diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
index 891e9c31..bb2e3383 100644
--- a/cmake/modules/FindGStreamer.cmake
+++ b/cmake/modules/FindGStreamer.cmake
@@ -32,14 +32,14 @@ IF (NOT WIN32)
 ENDIF ()
 
 FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
-   PATHS
+   HINTS
    ${PC_GSTREAMER_INCLUDEDIR}
    ${PC_GSTREAMER_INCLUDE_DIRS}
    PATH_SUFFIXES gstreamer-1.0
    )
 
 FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
-   PATHS
+   HINTS
    ${PC_GSTREAMER_INCLUDEDIR}
    ${PC_GSTREAMER_INCLUDE_DIRS}
    PATH_SUFFIXES gstreamer-1.0
@@ -48,13 +48,13 @@ FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
 SET(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_CONF_INCLUDE_DIR})
 
 FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
-   PATHS
+   HINTS
    ${PC_GSTREAMER_LIBDIR}
    ${PC_GSTREAMER_LIBRARY_DIRS}
    )
 
 FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-1.0
-   PATHS
+   HINTS
    ${PC_GSTREAMER_LIBDIR}
    ${PC_GSTREAMER_LIBRARY_DIRS}
    )
diff --git a/cmake/modules/FindTelepathyFarstream.cmake b/cmake/modules/FindTelepathyFarstream.cmake
index ad6da206..c20ecea4 100644
--- a/cmake/modules/FindTelepathyFarstream.cmake
+++ b/cmake/modules/FindTelepathyFarstream.cmake
@@ -31,14 +31,14 @@ if (NOT WIN32)
 endif ()
 
 find_path(TELEPATHY_FARSTREAM_INCLUDE_DIR telepathy-farstream/telepathy-farstream.h
-   PATHS
+   HINTS
    ${PC_TELEPATHY_FARSTREAM_INCLUDEDIR}
    ${PC_TELEPATHY_FARSTREAM_INCLUDE_DIRS}
    PATH_SUFFIXES telepathy-1.0
    )
 
 find_library(TELEPATHY_FARSTREAM_LIBRARIES NAMES telepathy-farstream
-   PATHS
+   HINTS
    ${PC_TELEPATHY_FARSTREAM_LIBDIR}
    ${PC_TELEPATHY_FARSTREAM_LIBRARY_DIRS}
    )
diff --git a/cmake/modules/FindTelepathyGlib.cmake b/cmake/modules/FindTelepathyGlib.cmake
index 0e098be6..75e26159 100644
--- a/cmake/modules/FindTelepathyGlib.cmake
+++ b/cmake/modules/FindTelepathyGlib.cmake
@@ -33,14 +33,14 @@ if (TELEPATHY_GLIB_MIN_VERSION AND NOT PC_TELEPATHY_GLIB_FOUND)
     message(STATUS "Telepathy-glib not found or its version is < ${TELEPATHY_GLIB_MIN_VERSION}")
 else ()
     find_path(TELEPATHY_GLIB_INCLUDE_DIR telepathy-glib/client.h
-       PATHS
+       HINTS
        ${PC_TELEPATHY_GLIB_INCLUDEDIR}
        ${PC_TELEPATHY_GLIB_INCLUDE_DIRS}
        PATH_SUFFIXES telepathy-1.0
     )
 
     find_library(TELEPATHY_GLIB_LIBRARIES NAMES telepathy-glib
-       PATHS
+       HINTS
        ${PC_TELEPATHY_GLIB_LIBDIR}
        ${PC_TELEPATHY_GLIB_LIBRARY_DIRS}
     )