Repository: celix Updated Branches: refs/heads/feature/CELIX-237_rsa-ffi 799c484c4 -> 8b1b23cc1
CELIX-237: small change in find ffi.h for macport to support older cmake versions Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/8b1b23cc Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/8b1b23cc Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/8b1b23cc Branch: refs/heads/feature/CELIX-237_rsa-ffi Commit: 8b1b23cc169903716ad459a14300b840e2e9ebee Parents: 799c484 Author: Pepijn Noltes <pepijnnol...@gmail.com> Authored: Thu Jul 9 17:33:32 2015 +0200 Committer: Pepijn Noltes <pepijnnol...@gmail.com> Committed: Thu Jul 9 17:33:32 2015 +0200 ---------------------------------------------------------------------- cmake/FindFFI.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/8b1b23cc/cmake/FindFFI.cmake ---------------------------------------------------------------------- diff --git a/cmake/FindFFI.cmake b/cmake/FindFFI.cmake index 1dcf0c6..7fd04e4 100644 --- a/cmake/FindFFI.cmake +++ b/cmake/FindFFI.cmake @@ -32,11 +32,9 @@ find_library(FFI_LIBRARY NAMES ffi #NOTE on OSX ffi.h from macport is located at /opt/local/lib/libffi-<version>/ffi.h #Using FFI_LIBRARY location as hint to find it -get_filename_component(FFI_LIB_DIR ${FFI_LIBRARY} DIRECTORY) find_path(FFI_INCLUDE_DIR ffi.h - HINTS ${FFI_LIB_DIR}/* + HINTS /opt/local/lib/* PATH_SUFFIXES include include/ffi) -unset(FFI_LIB_DIR) find_path(FFI_INCLUDE_DIR ffi.h PATHS $ENV{FFI_DIR} ${FFI_DIR} /usr /usr/local /opt/local
