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 6FFE34D82 for ; Fri, 13 May 2011 18:28:13 +0000 (UTC) Received: (qmail 15928 invoked by uid 500); 13 May 2011 18:28:13 -0000 Delivered-To: apmail-incubator-celix-commits-archive@incubator.apache.org Received: (qmail 15910 invoked by uid 500); 13 May 2011 18:28:13 -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 15903 invoked by uid 99); 13 May 2011 18:28:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 May 2011 18:28:13 +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; Fri, 13 May 2011 18:28:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 829E123889BF; Fri, 13 May 2011 18:27:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1102854 - /incubator/celix/trunk/framework/CMakeLists.txt Date: Fri, 13 May 2011 18:27:52 -0000 To: celix-commits@incubator.apache.org From: abroekhuis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110513182752.829E123889BF@eris.apache.org> Author: abroekhuis Date: Fri May 13 18:27:52 2011 New Revision: 1102854 URL: http://svn.apache.org/viewvc?rev=1102854&view=rev Log: Added FindCURL Modified: incubator/celix/trunk/framework/CMakeLists.txt Modified: incubator/celix/trunk/framework/CMakeLists.txt URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1102854&r1=1102853&r2=1102854&view=diff ============================================================================== --- incubator/celix/trunk/framework/CMakeLists.txt (original) +++ incubator/celix/trunk/framework/CMakeLists.txt Fri May 13 18:27:52 2011 @@ -17,26 +17,34 @@ cmake_minimum_required(VERSION 2.8) include(FindZLIB) -include(FindAPR) - IF(ZLIB_FOUND) MESSAGE(STATUS "Looking for ZLIB - found") ELSE(ZLIB_FOUND) MESSAGE(FATAL_ERROR "Looking for ZLIB - not found") ENDIF(ZLIB_FOUND) +include(FindAPR) IF(APR_FOUND) MESSAGE(STATUS "Looking for APR - found") ELSE(APR_FOUND) MESSAGE(FATAL_ERROR "Looking for APR - not found") ENDIF(APR_FOUND) +include(FindCURL) +IF(CURL_FOUND) + MESSAGE(STATUS "Looking for CURL - found") +ELSE(CURL_FOUND) + MESSAGE(FATAL_ERROR "Looking for CURL - not found") +ENDIF(CURL_FOUND) + add_definitions(-DUSE_FILE32API) aux_source_directory("private/src" SRC) include_directories(${APR_INCLUDE_DIR}) +include_directories(${CURL_INCLUDE_DIR}) +include_directories(${ZLIB_INCLUDE_DIR}) include_directories("private/include") include_directories("${PROJECT_SOURCE_DIR}/utils/public/include") add_library(framework SHARED ${SRC}) -target_link_libraries(framework utils ${ZLIB_LIBRARY} ${APR_LIBRARY} curl) +target_link_libraries(framework utils ${ZLIB_LIBRARY} ${APR_LIBRARY} ${CURL_LIBRARY}) install(TARGETS framework LIBRARY DESTINATION lib COMPONENT framework)