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: updated FindFFI added hints for unbuntu's ffi directory layout
Date Sat, 04 Jul 2015 15:42:13 GMT
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-237_rsa-ffi 5b20ddb02 -> 951d66106


CELIX-237: updated FindFFI added hints for unbuntu's ffi directory layout


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

Branch: refs/heads/feature/CELIX-237_rsa-ffi
Commit: 951d66106084e44c0a9870c1708fefa3dcca3c44
Parents: 5b20ddb
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Sat Jul 4 17:41:27 2015 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Sat Jul 4 17:41:27 2015 +0200

----------------------------------------------------------------------
 cmake/FindFFI.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/951d6610/cmake/FindFFI.cmake
----------------------------------------------------------------------
diff --git a/cmake/FindFFI.cmake b/cmake/FindFFI.cmake
index 9ee947c..cc6c8c8 100644
--- a/cmake/FindFFI.cmake
+++ b/cmake/FindFFI.cmake
@@ -24,12 +24,12 @@
 #  FFI_LIBRARIES - The libraries needed to use this package
 
 find_path(FFI_INCLUDE_DIR ffi.h
-		PATHS $ENV{FFI_DIR} ${FFI_DIR} /usr /usr/local /opt/local
-          	PATH_SUFFIXES include include/ffi)
+		PATHS $ENV{FFI_DIR} ${FFI_DIR} /usr /usr/local /opt/local 
+        PATH_SUFFIXES include include/ffi include/x86_64-linux-gnu) 
 
 find_library(FFI_LIBRARY NAMES ffi
              	PATHS $ENV{FFI_DIR} ${FFI_DIR} /usr /usr/local /opt/local
-             	PATH_SUFFIXES lib lib64)
+             	PATH_SUFFIXES lib lib64 lib/x86_64-linux-gnu)
 
 
 include(FindPackageHandleStandardArgs)


Mime
View raw message