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 0711418E62 for ; Wed, 4 Nov 2015 09:13:34 +0000 (UTC) Received: (qmail 74347 invoked by uid 500); 4 Nov 2015 09:13:33 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 74320 invoked by uid 500); 4 Nov 2015 09:13:33 -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 74311 invoked by uid 99); 4 Nov 2015 09:13:33 -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, 04 Nov 2015 09:13:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B46D4DFE65; Wed, 4 Nov 2015 09:13:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bpetri@apache.org To: commits@celix.apache.org Message-Id: <8cac0c34488d40798a4e7a861c7054c5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: celix git commit: CELIX-285: remove obsolete jansson dependency Date: Wed, 4 Nov 2015 09:13:33 +0000 (UTC) Repository: celix Updated Branches: refs/heads/develop a50863d9f -> 77d49b4f3 CELIX-285: remove obsolete jansson dependency Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/77d49b4f Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/77d49b4f Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/77d49b4f Branch: refs/heads/develop Commit: 77d49b4f3d552dc9a3e1deb6011e6997426955d8 Parents: a50863d Author: Bjoern Petri Authored: Wed Nov 4 10:13:06 2015 +0100 Committer: Bjoern Petri Committed: Wed Nov 4 10:13:06 2015 +0100 ---------------------------------------------------------------------- remote_services/discovery_shm/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/77d49b4f/remote_services/discovery_shm/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/discovery_shm/CMakeLists.txt b/remote_services/discovery_shm/CMakeLists.txt index f784fd8..2e7c14d 100644 --- a/remote_services/discovery_shm/CMakeLists.txt +++ b/remote_services/discovery_shm/CMakeLists.txt @@ -19,10 +19,8 @@ celix_subproject(RSA_DISCOVERY_SHM "Option to enable building the Discovery (SHM if (RSA_DISCOVERY_SHM) find_package(CURL REQUIRED) find_package(LibXml2 REQUIRED) - find_package(Jansson REQUIRED) include_directories("${CURL_INCLUDE_DIR}") - include_directories("${JANSSON_INCLUDE_DIR}") include_directories("${LIBXML2_INCLUDE_DIR}") include_directories("${PROJECT_SOURCE_DIR}/utils/public/include") include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/private/include") @@ -35,6 +33,7 @@ find_package(CURL REQUIRED) include_directories("private/include") SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rsa_discovery_shm") + SET(BUNDLE_VERSION "0.0.1") SET_HEADERS("Bundle-Name: Apache Celix RSA Discovery SHM") bundle(discovery_shm SOURCES @@ -54,6 +53,6 @@ find_package(CURL REQUIRED) install_bundle(discovery_shm) - target_link_libraries(discovery_shm celix_framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${JANSSON_LIBRARIES}) + target_link_libraries(discovery_shm celix_framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES}) endif (RSA_DISCOVERY_SHM)