Return-Path: X-Original-To: apmail-incubator-celix-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-celix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EBD7611D62 for ; Thu, 12 Jun 2014 06:27:35 +0000 (UTC) Received: (qmail 97639 invoked by uid 500); 12 Jun 2014 06:27:35 -0000 Delivered-To: apmail-incubator-celix-commits-archive@incubator.apache.org Received: (qmail 97609 invoked by uid 500); 12 Jun 2014 06:27:35 -0000 Mailing-List: contact celix-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: celix-dev@incubator.apache.org Delivered-To: mailing list celix-commits@incubator.apache.org Received: (qmail 97602 invoked by uid 99); 12 Jun 2014 06:27:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jun 2014 06:27:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jun 2014 06:27:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0A3492388831; Thu, 12 Jun 2014 06:27:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1602069 - in /incubator/celix/trunk: cmake/modules/FindUUID.cmake framework/CMakeLists.txt Date: Thu, 12 Jun 2014 06:27:11 -0000 To: celix-commits@incubator.apache.org From: abroekhuis@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140612062712.0A3492388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: abroekhuis Date: Thu Jun 12 06:27:11 2014 New Revision: 1602069 URL: http://svn.apache.org/r1602069 Log: CELIX-122: Updated FindUUID to work on OSX. Modified: incubator/celix/trunk/cmake/modules/FindUUID.cmake incubator/celix/trunk/framework/CMakeLists.txt Modified: incubator/celix/trunk/cmake/modules/FindUUID.cmake URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/modules/FindUUID.cmake?rev=1602069&r1=1602068&r2=1602069&view=diff ============================================================================== --- incubator/celix/trunk/cmake/modules/FindUUID.cmake (original) +++ incubator/celix/trunk/cmake/modules/FindUUID.cmake Thu Jun 12 06:27:11 2014 @@ -24,8 +24,14 @@ find_library(UUID_LIBRARY NAMES uuid PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 /lib/i386-linux-gnu /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu) include(FindPackageHandleStandardArgs) +if (APPLE) +find_package_handle_standard_args(UUID DEFAULT_MSG + UUID_INCLUDE_DIR) +else () find_package_handle_standard_args(UUID DEFAULT_MSG UUID_LIBRARY UUID_INCLUDE_DIR) +endif () + mark_as_advanced(UUID_INCLUDE_DIR UUID_LIBRARY) Modified: incubator/celix/trunk/framework/CMakeLists.txt URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1602069&r1=1602068&r2=1602069&view=diff ============================================================================== --- incubator/celix/trunk/framework/CMakeLists.txt (original) +++ incubator/celix/trunk/framework/CMakeLists.txt Thu Jun 12 06:27:11 2014 @@ -67,7 +67,10 @@ if (FRAMEWORK) ${IO} ) - target_link_libraries(celix_framework celix_utils ${UUID_LIBRARY} ${ZLIB_LIBRARY} ${APR_LIBRARY}) + if(NOT APPLE) + set(UUID ${UUID_LIBRARY}) + endif() + target_link_libraries(celix_framework celix_utils ${UUID} ${ZLIB_LIBRARY} ${APR_LIBRARY}) install(TARGETS celix_framework DESTINATION lib COMPONENT framework) FILE(GLOB files "public/include/*.h")