projects
/
umurmur.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c37f535
)
fixed up CMakeFiles for nettle and gnutls
author
Felix Morgner
<felix.morgner@gmail.com>
Sat, 31 Jan 2015 11:57:16 +0000
(12:57 +0100)
committer
Felix Morgner
<felix.morgner@gmail.com>
Sat, 31 Jan 2015 12:12:21 +0000
(13:12 +0100)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index d96c4e264f61045c7a05389dfb7cf98714041c02..c59f76dee518659bad58d260636d1ba0eed93cea 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-48,6
+48,10
@@
elseif("${SSL}" STREQUAL "gnutls")
set(SSLIMP_INCLUDE_DIR ${GNUTLS_INCLUDE_DIR})
set(SSLIMP_LIBRARY_DIR ${GNUTLS_LIB_DIR})
endif(GNUTLS_FOUND)
set(SSLIMP_INCLUDE_DIR ${GNUTLS_INCLUDE_DIR})
set(SSLIMP_LIBRARY_DIR ${GNUTLS_LIB_DIR})
endif(GNUTLS_FOUND)
+ find_package(Nettle REQUIRED)
+ if(NETTLE_FOUND)
+ set(CRYPTO_LIBRARIES "${NETTLE_LIBRARIES}")
+ endif(NETTLE_FOUND)
endif("${SSL}" STREQUAL "openssl")
check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME_RT)
endif("${SSL}" STREQUAL "openssl")
check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME_RT)
@@
-57,7
+61,7
@@
if(NOT HAVE_CLOCK_GETTIME_RT)
if(NOT HAVE_CLOCK_GETTIME)
check_library_exists(c clock_get_time "mach/time.h" HAVE_CLOCK_GET_TIME)
if(NOT HAVE_CLOCK_GET_TIME)
if(NOT HAVE_CLOCK_GETTIME)
check_library_exists(c clock_get_time "mach/time.h" HAVE_CLOCK_GET_TIME)
if(NOT HAVE_CLOCK_GET_TIME)
- message(FATAL_ERROR "Didn't find clock_gettime() or clock_get_time!")
+ message(FATAL_ERROR "Didn't find clock_gettime() or clock_get_time
()
!")
endif()
endif()
else()
endif()
endif()
else()
@@
-82,9
+86,4
@@
endif(NOT OLD_CONFIG_FILE)
add_definitions(${SSLIMP_CFLAGS})
add_definitions(${SSLIMP_CFLAGS})
-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)
+target_link_libraries(umurmurd ${LIBCONFIG_LIBRARIES} ${PROTOBUFC_LIBRARIES} ${SSLIMP_LIBRARIES} ${LIBRT} ${CRYPTO_LIBRARIES})