From 745664f1266b3a46898c671ba17db21df19adebf Mon Sep 17 00:00:00 2001 From: Brody Kenrick Date: Wed, 11 Dec 2013 17:06:27 +1100 Subject: Ctests build for Glib2 - Add GLIB2_LIBDIR to find_library paths diff --git a/tests/FindGLIB2.cmake b/tests/FindGLIB2.cmake index b27b9a9..9164c39 100644 --- a/tests/FindGLIB2.cmake +++ b/tests/FindGLIB2.cmake @@ -2,13 +2,13 @@ find_package(PkgConfig REQUIRED) pkg_search_module(GLIB2 REQUIRED glib-2.0) #message("GLIB2_LIBRARIES ${GLIB2_LIBRARIES}") -#message("GLIB2_LIBRARY_DIRS ${GLIB2_LIBRARY_DIRS}") +message("GLIB2_LIBRARY_DIRS ${GLIB2_LIBRARY_DIRS}") #message("GLIB2_LDFLAGS ${GLIB2_LDFLAGS}") #message("GLIB2_LDFLAGS_OTHER ${GLIB2_LDFLAGS_OTHER}") message("GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS}") #message("GLIB2_CFLAGS ${GLIB2_CFLAGS}") #message("GLIB2_CFLAGS_OTHER ${GLIB2_CFLAGS_OTHER}") -#message("GLIB2_LIBDIR ${GLIB2_LIBDIR}") +message("GLIB2_LIBDIR ${GLIB2_LIBDIR}") set(GLIB2_DEFINITIONS ${GLIB2_CFLAGS_OTHER}) #message("GLIB2_DEFINITIONS ${GLIB2_DEFINITIONS}") @@ -20,6 +20,7 @@ foreach(GLIB2_LIB ${GLIB2_LIBRARY_NAMES}) set(TMP TMP-NOTFOUND) find_library(TMP NAMES ${GLIB2_LIB} PATHS ${GLIB2_LIBRARY_DIRS} + PATHS ${GLIB2_LIBDIR} NO_DEFAULT_PATH) # message("TMP: ${TMP}") list(APPEND GLIB2_LIBRARIES "${TMP}") -- cgit v0.10.1