[celix] branch develop updated: CELIX-426: Small update to FindFFI.cmake for a different pkg-config behaviour

[pnoltes]

This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/develop by this push:
     new 19b75ef  CELIX-426: Small update to FindFFI.cmake for a different 
pkg-config behaviour
19b75ef is described below

commit 19b75efec093eb54f1208eb9ffe722767a024f70
Author: Pepijn Noltes <pepijnnol...@gmail.com>
AuthorDate: Sun Apr 28 16:38:49 2019 +0200

    CELIX-426: Small update to FindFFI.cmake for a different pkg-config 
behaviour
---
 cmake/Modules/FindFFI.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/Modules/FindFFI.cmake b/cmake/Modules/FindFFI.cmake
index b386614..9bdabf2 100644
--- a/cmake/Modules/FindFFI.cmake
+++ b/cmake/Modules/FindFFI.cmake
@@ -34,9 +34,9 @@ if (PkgConfig_FOUND)
 
     #use found LIBFFI pkg config info to search for the abs path fo the libffi 
lib.
     #Note that the abs path info  is not present in the pkg-config results 
(only the -l and -L arguments)
-    find_library(FFI_ABS_LIB NAMES ffi PATHS ${LIBFFI_LIBRARY_DIRS} 
NO_DEFAULT_PATH NO_PACKAGE_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_SYSTEM_PATH)
+    find_library(FFI_ABS_LIB NAMES ffi PATHS ${LIBFFI_LIBRARY_DIRS} 
${LIBFFI_LIBDIR} NO_DEFAULT_PATH NO_PACKAGE_ROOT_PATH NO_CMAKE_PATH 
NO_CMAKE_SYSTEM_PATH)
     if (NOT FFI_ABS_LIB)
-        message(FATAL_ERROR "Cannot find abs path of libffi based on pkgconfig 
results")
+           message(FATAL_ERROR "Cannot find abs path of libffi based on 
pkgconfig results. Tried to find libffi @ '${LIBFFI_LIBRARY_DIRS}' and 
'${LIBFFI_LIBDIR}'")
     endif ()
 
     add_library(ffi::lib SHARED IMPORTED)
@@ -77,4 +77,4 @@ else()
                 INTERFACE_INCLUDE_DIRECTORIES "${FFI_INCLUDE_DIR}"
         )
     endif()
-endif ()
\ No newline at end of file
+endif ()