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/methods/CMakeLists.txt | 4 ++++ src/methods/xsalsa20_poly1305/CMakeLists.txt | 1 + 2 files changed, 5 insertions(+) (limited to 'src/methods') diff --git a/src/methods/CMakeLists.txt b/src/methods/CMakeLists.txt index f67ea0c..3d1e2e2 100644 --- a/src/methods/CMakeLists.txt +++ b/src/methods/CMakeLists.txt @@ -17,6 +17,10 @@ macro(fastd_method_link_libraries) fastd_module_link_libraries(method ${ARGN}) endmacro(fastd_method_link_libraries) +macro(fastd_method_require) + fastd_module_require(method ${ARGN}) +endmacro(fastd_method_require) + add_subdirectory(null) add_subdirectory(generic_gcm) diff --git a/src/methods/xsalsa20_poly1305/CMakeLists.txt b/src/methods/xsalsa20_poly1305/CMakeLists.txt index d071d99..97dee39 100644 --- a/src/methods/xsalsa20_poly1305/CMakeLists.txt +++ b/src/methods/xsalsa20_poly1305/CMakeLists.txt @@ -3,3 +3,4 @@ fastd_method(xsalsa20-poly1305 ) fastd_method_include_directories(xsalsa20-poly1305 ${NACL_INCLUDE_DIRS}) fastd_method_link_libraries(xsalsa20-poly1305 method_common ${NACL_LIBRARIES}) +fastd_method_require(xsalsa20-poly1305 NACL) -- cgit v1.2.3