projects
/
umurmur.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1731421
)
ok, now it actually builds...
author
Felix Morgner
<felix.morgner@gmail.com>
Fri, 30 Jan 2015 16:32:16 +0000
(17:32 +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 7b784e4760ce6eb9132b283a97172835cd440500..d96c4e264f61045c7a05389dfb7cf98714041c02 100644
(file)
--- 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)
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)
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})
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)