Return-Path: X-Original-To: apmail-celix-commits-archive@www.apache.org Delivered-To: apmail-celix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 106D01867F for ; Tue, 27 Oct 2015 15:21:12 +0000 (UTC) Received: (qmail 55087 invoked by uid 500); 27 Oct 2015 15:21:07 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 55007 invoked by uid 500); 27 Oct 2015 15:21:07 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 54747 invoked by uid 99); 27 Oct 2015 15:21:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Oct 2015 15:21:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C3D92E0BB8; Tue, 27 Oct 2015 15:21:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pnoltes@apache.org To: commits@celix.apache.org Date: Tue, 27 Oct 2015 15:21:17 -0000 Message-Id: <841e8d8b27a54d61abdc1704f379786d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/50] celix git commit: CELIX-237: added x86_64-linux-gnu as path suffixes 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/feature/CELIX-230_Refactoring_of_the_shell_command_service Commit: 5a4be72cd95a512df9ac0d9802d60d3d81de112b Parents: 13b8274 Author: Pepijn Noltes Authored: Tue Oct 13 23:05:26 2015 +0200 Committer: Pepijn Noltes 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} )