From: Felix Morgner Date: Fri, 30 Jan 2015 16:32:16 +0000 (+0100) Subject: ok, now it actually builds... X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=8e149de110d772f160be4993c11aa781d08d31f6 ok, now it actually builds... --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b784e4..d96c4e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ elseif("${SSL}" STREQUAL "gnutls") find_package(GnuTLS REQUIRED) if(GNUTLS_FOUND) set(USE_GNUTLS ON) - set(SSLIMP_LIBRARIES "${GNUTLS_LIBRARIES} crypto") # FIXME: port AES128-OCB + set(SSLIMP_LIBRARIES ${GNUTLS_LIBRARIES}) set(SSLIMP_INCLUDE_DIR ${GNUTLS_INCLUDE_DIR}) set(SSLIMP_LIBRARY_DIR ${GNUTLS_LIB_DIR}) endif(GNUTLS_FOUND) @@ -81,4 +81,10 @@ if(NOT OLD_CONFIG_FILE) endif(NOT OLD_CONFIG_FILE) add_definitions(${SSLIMP_CFLAGS}) -target_link_libraries(umurmurd ${LIBCONFIG_LIBRARIES} ${PROTOBUFC_LIBRARIES} ${SSLIMP_LIBRARIES} ${LIBRT}) + +if(USE_GNUTLS) +# FIXME: port AES128-OCB + target_link_libraries(umurmurd ${LIBCONFIG_LIBRARIES} ${PROTOBUFC_LIBRARIES} ${SSLIMP_LIBRARIES} ${LIBRT} crypto) +else() + target_link_libraries(umurmurd ${LIBCONFIG_LIBRARIES} ${PROTOBUFC_LIBRARIES} ${SSLIMP_LIBRARIES} ${LIBRT}) +endif(USE_GNUTLS)