From 8764a80ac01c5b37e6657db07bba7323e2a61906 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 2 Nov 2013 18:28:22 +0100 Subject: More CMake cleanup and fixes --- src/methods/generic_gcm/CMakeLists.txt | 2 -- src/methods/null/CMakeLists.txt | 2 -- src/methods/xsalsa20_poly1305/CMakeLists.txt | 3 +-- 3 files changed, 1 insertion(+), 6 deletions(-) (limited to 'src/methods') diff --git a/src/methods/generic_gcm/CMakeLists.txt b/src/methods/generic_gcm/CMakeLists.txt index 8c22292..df1cec9 100644 --- a/src/methods/generic_gcm/CMakeLists.txt +++ b/src/methods/generic_gcm/CMakeLists.txt @@ -1,5 +1,3 @@ -include_directories(${FASTD_SOURCE_DIR} ${FASTD_BINARY_DIR}/src) - add_library(method_generic_gcm OBJECT generic_gcm.c ) diff --git a/src/methods/null/CMakeLists.txt b/src/methods/null/CMakeLists.txt index d65a342..750da66 100644 --- a/src/methods/null/CMakeLists.txt +++ b/src/methods/null/CMakeLists.txt @@ -1,5 +1,3 @@ -include_directories(${FASTD_SOURCE_DIR} ${FASTD_BINARY_DIR}/src) - add_library(method_null OBJECT null.c ) diff --git a/src/methods/xsalsa20_poly1305/CMakeLists.txt b/src/methods/xsalsa20_poly1305/CMakeLists.txt index 66dcb7e..f2129d6 100644 --- a/src/methods/xsalsa20_poly1305/CMakeLists.txt +++ b/src/methods/xsalsa20_poly1305/CMakeLists.txt @@ -1,6 +1,5 @@ -include_directories(${FASTD_SOURCE_DIR} ${FASTD_BINARY_DIR}/src ${NACL_INCLUDE_DIRS}) - add_library(method_xsalsa20_poly1305 OBJECT xsalsa20_poly1305.c ) set_property(TARGET method_xsalsa20_poly1305 PROPERTY COMPILE_FLAGS "${FASTD_CFLAGS}") +target_include_directories(method_xsalsa20_poly1305 PRIVATE ${NACL_INCLUDE_DIRS}) -- cgit v1.2.3