From bdd18cb2bc603bfedd5203f40fc4ac0a0b809e89 Mon Sep 17 00:00:00 2001 From: Michael Dickens Date: Fri, 6 Dec 2013 13:16:02 +0100 Subject: [PATCH] gr-fosphor/cmake: Use HINTS rather than PATHS for path from pkg-config Signed-off-by: Sylvain Munaut --- cmake/Modules/FindFreetype2.cmake | 4 ++-- cmake/Modules/FindGLFW3.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Modules/FindFreetype2.cmake b/cmake/Modules/FindFreetype2.cmake index d78bea6..69eb5d1 100644 --- a/cmake/Modules/FindFreetype2.cmake +++ b/cmake/Modules/FindFreetype2.cmake @@ -2,15 +2,15 @@ if(NOT FREETYPE2_FOUND) INCLUDE(FindPkgConfig) pkg_check_modules (FREETYPE2_PKG freetype2) find_path(FREETYPE2_INCLUDE_DIRS NAMES freetype/freetype.h + HINTS ${FREETYPE2_PKG_INCLUDE_DIRS} PATHS - ${FREETYPE2_PKG_INCLUDE_DIRS} /usr/include/freetype2 /usr/local/include/freetype2 ) find_library(FREETYPE2_LIBRARIES NAMES freetype + HINTS ${FREETYPE2_PKG_LIBRARY_DIRS} PATHS - ${FREETYPE2_PKG_LIBRARY_DIRS} /usr/lib /usr/local/lib ) diff --git a/cmake/Modules/FindGLFW3.cmake b/cmake/Modules/FindGLFW3.cmake index 9ac63bd..c6e9395 100644 --- a/cmake/Modules/FindGLFW3.cmake +++ b/cmake/Modules/FindGLFW3.cmake @@ -2,15 +2,15 @@ if(NOT GLFW3_FOUND) INCLUDE(FindPkgConfig) pkg_check_modules (GLFW3_PKG glfw3) find_path(GLFW3_INCLUDE_DIRS NAMES GLFW/glfw3.h + HINTS ${GLFW3_PKG_INCLUDE_DIRS} PATHS - ${GLFW3_PKG_INCLUDE_DIRS} /usr/include /usr/local/include ) find_library(GLFW3_LIBRARIES NAMES glfw3 glfw + HINTS ${GLFW3_PKG_LIBRARY_DIRS} PATHS - ${GLFW3_PKG_LIBRARY_DIRS} /usr/lib /usr/local/lib )