Repository: celix Updated Branches: refs/heads/feature/CELIX-269_depman 224617488 -> d040f001a
CELIX-237: Update FindFFI. updated travis.yml to see if the correct libffi is selected Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/bfa056cb Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/bfa056cb Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/bfa056cb Branch: refs/heads/feature/CELIX-269_depman Commit: bfa056cb9644da5ec973503695be2222bcf2842b Parents: 9e99105 Author: Pepijn Noltes <pepijnnol...@gmail.com> Authored: Wed Oct 14 10:41:53 2015 +0200 Committer: Pepijn Noltes <pepijnnol...@gmail.com> Committed: Wed Oct 14 10:41:53 2015 +0200 ---------------------------------------------------------------------- .travis.yml | 1 + cmake/FindFFI.cmake | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/bfa056cb/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 9816f17..1fea4db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ before_script: - cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr . && make - sudo make install - cd - + - ls /usr/lib/x86_64-linux-gnu/libffi.so - wget ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz -O /tmp/libffi.tar.gz - tar xzf /tmp/libffi.tar.gz - cd libffi* http://git-wip-us.apache.org/repos/asf/celix/blob/bfa056cb/cmake/FindFFI.cmake ---------------------------------------------------------------------- diff --git a/cmake/FindFFI.cmake b/cmake/FindFFI.cmake index 59b805a..b94642d 100644 --- a/cmake/FindFFI.cmake +++ b/cmake/FindFFI.cmake @@ -33,8 +33,8 @@ endif () 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 + PATHS $ENV{FFI_DIR} ${FFI_DIR} /usr /usr/local /opt/local + PATH_SUFFIXES lib lib64 x86_64-linux-gnu lib/x86_64-linux-gnu HINTS ${PC_LIBFFI_LIBDIR} ${PC_LIBFFI_LIBRARY_DIRS} )