From 1d3c16da705df628cdeeb90cce0b7420a1fc092b Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Thu, 24 Oct 2013 20:46:44 +0200 Subject: Don't insist on debug library when compiling on windows --- contrib/cmake/FindEVENT.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/cmake/FindEVENT.cmake b/contrib/cmake/FindEVENT.cmake index 418ebab..a32dbdf 100644 --- a/contrib/cmake/FindEVENT.cmake +++ b/contrib/cmake/FindEVENT.cmake @@ -25,7 +25,7 @@ FIND_LIBRARY(EVENT_LIBRARY_DEBUG if (EVENT_LIBRARY_DEBUG) list(APPEND EVENT_LIBRARY debug ${EVENT_LIBRARY_DEBUG}) else() - if (UNIX) + if (EVENT_LIBRARY_RELEASE) list(APPEND EVENT_LIBRARY debug ${EVENT_LIBRARY_RELEASE}) endif() endif() @@ -35,10 +35,10 @@ endif() FIND_LIBRARY(EVENT_SSL_LIBRARY_RELEASE NAMES event_openssl libevent_openssl HINTS $ENV{EVENT_SRC}/.libs/ - SET(EVENT_SSL_FOUND ON) ) if (EVENT_SSL_LIBRARY_RELEASE) list(APPEND EVENT_LIBRARY optimized ${EVENT_SSL_LIBRARY_RELEASE}) + SET(EVENT_SSL_FOUND ON) endif() FIND_LIBRARY(EVENT_SSL_LIBRARY_DEBUG @@ -48,7 +48,7 @@ FIND_LIBRARY(EVENT_SSL_LIBRARY_DEBUG if (EVENT_SSL_LIBRARY_DEBUG) list(APPEND EVENT_LIBRARY debug ${EVENT_SSL_LIBRARY_DEBUG}) else() - if (UNIX AND EVENT_SSL_LIBRARY_RELEASE) + if (EVENT_SSL_LIBRARY_RELEASE) list(APPEND EVENT_LIBRARY debug ${EVENT_SSL_LIBRARY_RELEASE}) endif() endif() @@ -76,8 +76,8 @@ if (NOT WIN32) endif() -# message(FATAL_ERROR "EVENT_LIBRARY: ${EVENT_LIBRARY}") +#message(FATAL_ERROR "EVENT_SSL_FOUND: ${EVENT_SSL_FOUND}") INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(EVENT DEFAULT_MSG EVENT_LIBRARY EVENT_INCLUDE_DIR) -MARK_AS_ADVANCED(EVENT_LIBRARY EVENT_INCLUDE_DIR) +MARK_AS_ADVANCED(EVENT_LIBRARY EVENT_INCLUDE_DIR EVENT_SSL_FOUND) -- cgit v0.12