From c0090d8cfe2e7f13566eaaa215675ae939d5e010 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Fri, 1 May 2015 14:36:39 +0200 Subject: [PATCH] Also let CMake find grass libs in default system location --- cmake/FindGRASS.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmake/FindGRASS.cmake b/cmake/FindGRASS.cmake index a84f63925b6..13734120518 100644 --- a/cmake/FindGRASS.cmake +++ b/cmake/FindGRASS.cmake @@ -41,7 +41,14 @@ MACRO (CHECK_GRASS G_PREFIX) MARK_AS_ADVANCED ( GRASS_LIBRARY${GRASS_FIND_VERSION}_${LIB} ) SET(LIB_PATH NOTFOUND) + # FIND_PATH and FIND_LIBRARY normally search standard locations + # before the specified paths. To search non-standard paths first, + # FIND_* is invoked first with specified paths and NO_DEFAULT_PATH + # and then again with no specified paths to search the default + # locations. When an earlier FIND_* succeeds, subsequent FIND_*s + # searching for the same item do nothing. FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib NO_DEFAULT_PATH) + FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib) IF(LIB_PATH) SET(GRASS_LIBRARY${GRASS_FIND_VERSION}_${LIB} ${LIB_PATH})