From d9980beef1eacf3c263b655f54d1eec518ca8ef9 Mon Sep 17 00:00:00 2001 From: Roland Kaufmann Date: Fri, 22 Feb 2013 12:45:41 +0100 Subject: [PATCH] Guess where libraries are using full path Because the probe is run from the project source tree(!) --- cmake/Modules/OpmPackage.cmake | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/OpmPackage.cmake b/cmake/Modules/OpmPackage.cmake index eebf6616..4fedbe5a 100644 --- a/cmake/Modules/OpmPackage.cmake +++ b/cmake/Modules/OpmPackage.cmake @@ -87,9 +87,16 @@ function (find_opm_package module deps header lib defs prog conf) # but with a -build suffix if (NOT (${module}_DIR OR ${module}_ROOT)) string (TOLOWER "${module}" _module_lower) - set (_guess "../${module}" "../${module}-build" - "../${_module_lower}" "../${_module_lower}-build" + set (_guess + "../${module}" + "../${module}-build" + "../${_module_lower}" + "../${_module_lower}-build" ) + set (_guess_bin) + foreach (_item IN ITEMS ${_guess}) + list (APPEND _guess_bin "${PROJECT_BINARY_DIR}/${_item}") + endforeach (_item) endif (NOT (${module}_DIR OR ${module}_ROOT)) # search for this include and library file to get the installation @@ -106,7 +113,7 @@ function (find_opm_package module deps header lib defs prog conf) if (NOT "${lib}" STREQUAL "") find_library (${module}_LIBRARY NAMES "${lib}" - PATHS ${_guess} + PATHS ${_guess_bin} HINTS ${${module}_DIR} ${${module}_ROOT} ${PkgConf_${module}_LIBRARY_DIRS} PATH_SUFFIXES "lib" "lib/.libs" ".libs" "lib32" "lib64" "lib/${CMAKE_LIBRARY_ARCHITECTURE}" )