Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 01B57200BAC for ; Wed, 26 Oct 2016 14:15:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0017F160B0A; Wed, 26 Oct 2016 12:15:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 48D26160ACA for ; Wed, 26 Oct 2016 14:15:28 +0200 (CEST) Received: (qmail 33480 invoked by uid 500); 26 Oct 2016 12:15:27 -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 32537 invoked by uid 99); 26 Oct 2016 12:15:25 -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; Wed, 26 Oct 2016 12:15:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3B48EDFBA0; Wed, 26 Oct 2016 12:15:25 +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: Wed, 26 Oct 2016 12:15:42 -0000 Message-Id: <789198c7e6c948b3a34d1d0a25377feb@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [19/50] [abbrv] celix git commit: CELIX-377: Adds work around for Android issue with libcelix_dfi archived-at: Wed, 26 Oct 2016 12:15:29 -0000 CELIX-377: Adds work around for Android issue with libcelix_dfi Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/525dc872 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/525dc872 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/525dc872 Branch: refs/heads/master Commit: 525dc87252474d80ca1c761768ef5569e87d9043 Parents: 1379a35 Author: Pepijn Noltes Authored: Fri Oct 7 17:20:06 2016 +0200 Committer: Pepijn Noltes Committed: Fri Oct 7 17:20:06 2016 +0200 ---------------------------------------------------------------------- launcher/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/525dc872/launcher/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 4f9056a..920d4c0 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -27,7 +27,9 @@ if (LAUNCHER) set_target_properties(celix PROPERTIES "INSTALL_RPATH" "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") target_link_libraries(celix celix_framework ${CURL_LIBRARIES}) - target_link_libraries(celix celix_dfi) #note not strictly needed, but ensure libdfi is a dep for the framework, useful when create docker images + if (NOT ANDROID) + target_link_libraries(celix celix_dfi) #note not strictly needed, but ensure libdfi is a dep for the framework, useful when create docker images + endif() include_directories("${PROJECT_SOURCE_DIR}/utils/public/include") include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")