celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-237: added x86_64-linux-gnu as path suffixes
Date Tue, 13 Oct 2015 21:06:24 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 13b82745e -> 5a4be72cd


CELIX-237: added x86_64-linux-gnu as path suffixes


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/5a4be72c
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/5a4be72c
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/5a4be72c

Branch: refs/heads/develop
Commit: 5a4be72cd95a512df9ac0d9802d60d3d81de112b
Parents: 13b8274
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Tue Oct 13 23:05:26 2015 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Tue Oct 13 23:05:26 2015 +0200

----------------------------------------------------------------------
 cmake/FindFFI.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/5a4be72c/cmake/FindFFI.cmake
----------------------------------------------------------------------
diff --git a/cmake/FindFFI.cmake b/cmake/FindFFI.cmake
index 0493633..59b805a 100644
--- a/cmake/FindFFI.cmake
+++ b/cmake/FindFFI.cmake
@@ -34,12 +34,13 @@ mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY)
 
 find_library(FFI_LIBRARY NAMES ffi libffi
         PATHS $ENV{FFI_DIR} ${FFI_DIR} /usr/local /opt/local
+        PATH_SUFFIXES lib x86_64-linux-gnu lib/x86_64-linux-gnu lib64
         HINTS ${PC_LIBFFI_LIBDIR} ${PC_LIBFFI_LIBRARY_DIRS}
 )
 
 find_path(FFI_INCLUDE_DIR ffi.h
 		PATHS $ENV{FFI_DIR} ${FFI_DIR} /usr /usr/local /opt/local 
-        PATH_SUFFIXES include include/ffi
+        PATH_SUFFIXES include include/ffi include/x86_64-linux-gnu x86_64-linux-gnu
         HINTS ${PC_LIBFFI_INCLUDEDIR} ${PC_LIBFFI_INCLUDE_DIRS}
 )
 


Mime
View raw message