diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-11-02 18:28:22 +0100 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-11-02 18:28:22 +0100 |
commit | 8764a80ac01c5b37e6657db07bba7323e2a61906 (patch) | |
tree | 7f52203bacce47a52e22da909fc4cf07128381ca /src/methods | |
parent | 38b7d50694b4a9929cc0d5bca884a52d5aeaa8a4 (diff) | |
download | fastd-8764a80ac01c5b37e6657db07bba7323e2a61906.tar fastd-8764a80ac01c5b37e6657db07bba7323e2a61906.zip |
More CMake cleanup and fixes
Diffstat (limited to 'src/methods')
-rw-r--r-- | src/methods/generic_gcm/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/methods/null/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/methods/xsalsa20_poly1305/CMakeLists.txt | 3 |
3 files changed, 1 insertions, 6 deletions
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}) |