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 E6ADB18712 for ; Fri, 5 Feb 2016 11:00:20 +0000 (UTC) Received: (qmail 30712 invoked by uid 500); 5 Feb 2016 11:00:20 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 30651 invoked by uid 500); 5 Feb 2016 11:00:20 -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 30311 invoked by uid 99); 5 Feb 2016 11:00:20 -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; Fri, 05 Feb 2016 11:00:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7E83CDFF96; Fri, 5 Feb 2016 11:00:20 +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: Fri, 05 Feb 2016 11:00:36 -0000 Message-Id: <1e61c20b4cb64b9f851e84dc41ca2d06@git.apache.org> In-Reply-To: <673f383023104534981816b1b7de7d9e@git.apache.org> References: <673f383023104534981816b1b7de7d9e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/42] celix git commit: CELIX-335: Fix invalid linking setup for linux for the tracker_depman example CELIX-335: Fix invalid linking setup for linux for the tracker_depman example Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/17a07535 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/17a07535 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/17a07535 Branch: refs/heads/develop Commit: 17a07535942c6c7f0ed5cc923a1c977aa4c12908 Parents: 40bf193 Author: Pepijn Noltes Authored: Tue Jan 12 13:01:42 2016 +0100 Committer: Pepijn Noltes Committed: Tue Jan 12 13:01:42 2016 +0100 ---------------------------------------------------------------------- examples/whiteboard/tracker_depman/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/17a07535/examples/whiteboard/tracker_depman/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/examples/whiteboard/tracker_depman/CMakeLists.txt b/examples/whiteboard/tracker_depman/CMakeLists.txt index a2d6287..3bd5942 100644 --- a/examples/whiteboard/tracker_depman/CMakeLists.txt +++ b/examples/whiteboard/tracker_depman/CMakeLists.txt @@ -32,5 +32,5 @@ include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include") IF(APPLE) target_link_libraries(tracker_depman celix_framework -Wl,-all_load dependency_manager_static) else() -target_link_libraries(tracker_depman -Wl,--whole-archive dependency_manager -Wl,--no-whole-archive celix_framework_static) +target_link_libraries(tracker_depman -Wl,--whole-archive dependency_manager_static -Wl,--no-whole-archive celix_framework) ENDIF()