summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-10-24 18:46:44 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-10-24 18:46:44 (GMT)
commit1d3c16da705df628cdeeb90cce0b7420a1fc092b (patch)
tree7399145754659f583c3ed39bf081ec988143f72f /contrib
parentbb6d4295acf8050a510e30db5114ed9cf3ab6c61 (diff)
downloaduscxml-1d3c16da705df628cdeeb90cce0b7420a1fc092b.zip
uscxml-1d3c16da705df628cdeeb90cce0b7420a1fc092b.tar.gz
uscxml-1d3c16da705df628cdeeb90cce0b7420a1fc092b.tar.bz2
Don't insist on debug library when compiling on windows
Diffstat (limited to 'contrib')
-rw-r--r--contrib/cmake/FindEVENT.cmake10
1 files 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)