Merge branch 'release/0.3.3'

ellzey · Jun 22, 2011 · 588a25c · 588a25c
2 parents bc3ae03 + 67307f1
commit 588a25c
Show file tree

Hide file tree

Showing 7 changed files with 583 additions and 47 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(reason)
 
 set(PROJECT_MAJOR_VERSION 0)
 set(PROJECT_MINOR_VERSION 3)
-set(PROJECT_PATCH_VERSION 2)
+set(PROJECT_PATCH_VERSION 3)
 
 set (PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION})
 set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
@@ -25,12 +25,15 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/http_parser
 )
 
-set(LIBEVHTP_EXTERNAL_LIBS 
-	${LIBEVENT_LIBRARY}
-  ${LIBEVENT_PTHREADS_LIBRARY}
-	${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/build
-)
+set(LIBEVHTP_EXTERNAL_LIBS ${LIBEVENT_LIBRARY} ${LIBEVENT_PTHREADS_LIBRARY} ${LIBEVENT_OPENSSL_LIBRARY})
+
+if (NOT ${LIBEVENT_PTHREADS_FOUND}) 
+	set(DISABLE_EVTHR 1)
+endif(NOT ${LIBEVENT_PTHREADS_FOUND})
+
+if (NOT ${LIBEVENT_OPENSSL_FOUND}) 
+	set (DISABLE_SSL 1)
+endif(NOT ${LIBEVENT_OPENSSL_FOUND})
 
 if (DISABLE_EVTHR)
 	set(LIBEVHTP_SOURCES http_parser/http_parser.c evhtp.c)
@@ -40,7 +43,7 @@ endif(DISABLE_EVTHR)
 
 add_library(libevhtp STATIC ${LIBEVHTP_SOURCES})
 set_target_properties(libevhtp PROPERTIES OUTPUT_NAME "evhtp")
-target_link_libraries(libevhtp ${LIVEVHTP_EXTERNAL_LIBS})
+#target_link_libraries(libevhtp ${LIVEVHTP_EXTERNAL_LIBS})
 
 add_executable(test test.c)
-target_link_libraries(test libevhtp event event_pthreads)
+target_link_libraries(test libevhtp ${LIBEVHTP_EXTERNAL_LIBS})
diff --git a/CMakeModules/BaseConfig.cmake b/CMakeModules/BaseConfig.cmake
@@ -19,6 +19,10 @@ if (DISABLE_EVTHR)
        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_EVTHR")
 endif(DISABLE_EVTHR)
 
+if (DISABLE_SSL)
+			set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_SSL")
+endif(DISABLE_SSL)
+
 if (NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Release)
 endif(NOT CMAKE_BUILD_TYPE)
diff --git a/CMakeModules/FindLibEvent.cmake b/CMakeModules/FindLibEvent.cmake
@@ -10,12 +10,14 @@ FIND_LIBRARY(LIBEVENT_LIBRARY NAMES event)
 FIND_LIBRARY(LIBEVENT_CORE_LIBRARY NAMES event_core)
 FIND_LIBRARY(LIBEVENT_PTHREADS_LIBRARY NAMES event_pthreads)
 FIND_LIBRARY(LIBEVENT_EXTRA_LIBRARY NAMES event_extra)
+FIND_LIBRARY(LIBEVENT_OPENSSL_LIBRARY NAMES event_openssl)
 
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEvent DEFAULT_MSG LIBEVENT_LIBRARY LIBEVENT_INCLUDE_DIR)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEventPthreads DEFAULT_MSG LIBEVENT_PTHREADS_LIBRARY LIBEVENT_INCLUDE_DIR)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEventCore DEFAULT_MSG LIBEVENT_CORE_LIBRARY LIBEVENT_INCLUDE_DIR)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEventExtra DEFAULT_MSG LIBEVENT_EXTRA_LIBRARY LIBEVENT_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEventOpenssl DEFAULT_MSG LIBEVENT_OPENSSL_LIBRARY LIBEVENT_INCLUDE_DIR)
 
-MARK_AS_ADVANCED(LIBEVENT_INCLUDE_DIR LIBEVENT_LIBRARY LIBEVENT_PTHREADS_LIBRARY LIBEVENT_CORE_LIBRARY LIBEVENT_EXTRA_LIBRARY)
+MARK_AS_ADVANCED(LIBEVENT_INCLUDE_DIR LIBEVENT_LIBRARY LIBEVENT_PTHREADS_LIBRARY LIBEVENT_OPENSSL_LIBRARY LIBEVENT_CORE_LIBRARY LIBEVENT_EXTRA_LIBRARY)