From b117a60e81c3d67880cd8b0079041c92a0818d96 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 3 Nov 2013 11:12:42 +0100 Subject: Allow building without NaCl again --- src/crypto/cipher/CMakeLists.txt | 4 ++++ src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt | 1 + src/crypto/mac/CMakeLists.txt | 4 ++++ 3 files changed, 9 insertions(+) (limited to 'src/crypto') diff --git a/src/crypto/cipher/CMakeLists.txt b/src/crypto/cipher/CMakeLists.txt index 3d70c70..addb28c 100644 --- a/src/crypto/cipher/CMakeLists.txt +++ b/src/crypto/cipher/CMakeLists.txt @@ -31,6 +31,10 @@ macro(fastd_cipher_impl_link_libraries cipher name) fastd_module_link_libraries(cipher "${cipher} ${name}" ${ARGN}) endmacro(fastd_cipher_impl_link_libraries) +macro(fastd_cipher_impl_require cipher name) + fastd_module_require(cipher "${cipher} ${name}" ${ARGN}) +endmacro(fastd_cipher_impl_require) + add_subdirectory(aes128_ctr) diff --git a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt index 50e2283..676aa5d 100644 --- a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt +++ b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt @@ -3,3 +3,4 @@ fastd_cipher_impl(aes128-ctr nacl ) fastd_cipher_impl_include_directories(aes128-ctr nacl ${NACL_INCLUDE_DIRS}) fastd_cipher_impl_link_libraries(aes128-ctr nacl ${NACL_LIBRARIES}) +fastd_cipher_impl_require(aes128-ctr nacl NACL) diff --git a/src/crypto/mac/CMakeLists.txt b/src/crypto/mac/CMakeLists.txt index 8c80ee1..fe13ace 100644 --- a/src/crypto/mac/CMakeLists.txt +++ b/src/crypto/mac/CMakeLists.txt @@ -31,6 +31,10 @@ macro(fastd_mac_impl_link_libraries mac name) fastd_module_link_libraries(mac "${mac} ${name}" ${ARGN}) endmacro(fastd_mac_impl_link_libraries) +macro(fastd_mac_impl_require mac name) + fastd_module_require(mac "${mac} ${name}" ${ARGN}) +endmacro(fastd_mac_impl_require) + add_subdirectory(ghash) -- cgit v1.2.3