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 53220200BA2 for ; Sun, 16 Oct 2016 14:47:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 44014160AFE; Sun, 16 Oct 2016 12:47:04 +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 8B417160AFB for ; Sun, 16 Oct 2016 14:47:03 +0200 (CEST) Received: (qmail 4702 invoked by uid 500); 16 Oct 2016 12:47:02 -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 4440 invoked by uid 99); 16 Oct 2016 12:47:01 -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; Sun, 16 Oct 2016 12:47:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 67E18E38EE; Sun, 16 Oct 2016 12:47:01 +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: Sun, 16 Oct 2016 12:47:02 -0000 Message-Id: In-Reply-To: <8845fbcb792b49179f9a8a7323393d88@git.apache.org> References: <8845fbcb792b49179f9a8a7323393d88@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/8] celix git commit: CELIX-282: Disable importing/exporting libraries example for OSX. archived-at: Sun, 16 Oct 2016 12:47:04 -0000 CELIX-282: Disable importing/exporting libraries example for OSX. Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/24894196 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/24894196 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/24894196 Branch: refs/heads/develop Commit: 24894196b959da980a1b6798299af572e9be2782 Parents: 2c74cc3 Author: Pepijn Noltes Authored: Sat Oct 15 16:37:15 2016 +0200 Committer: Pepijn Noltes Committed: Sat Oct 15 16:37:15 2016 +0200 ---------------------------------------------------------------------- examples/hello_world/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/24894196/examples/hello_world/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/examples/hello_world/CMakeLists.txt b/examples/hello_world/CMakeLists.txt index 04c79ed..e3a5c59 100644 --- a/examples/hello_world/CMakeLists.txt +++ b/examples/hello_world/CMakeLists.txt @@ -15,6 +15,9 @@ # specific language governing permissions and limitations # under the License. +if(NOT APPLE) +#Importing and exporting libraries not (yet) work under OSX. + include_directories("${PROJECT_SOURCE_DIR}/utils/public/include") include_directories("public/include") @@ -36,7 +39,7 @@ add_bundle(hello IMPORT_LIBRARIES hello_test2lib ) -add_bundle(hello_import +add_bundle(hello_export VERSION "1.0" NO_ACTIVATOR EXPORT_LIBRARIES hello_test2lib @@ -54,5 +57,7 @@ add_deploy(helloworld_byref add_deploy(helloworld_withcopy GROUP hello COPY #Ensures that bundles are copied in the deploy location - BUNDLES hello_import hello shell shell_tui + BUNDLES hello_export hello shell shell_tui ) + +endif() \ No newline at end of file