celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1102854 - /incubator/celix/trunk/framework/CMakeLists.txt
Date Fri, 13 May 2011 18:27:52 GMT
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)



Mime
View raw message