diff options
| -rw-r--r-- | cmake/generate_version.cmake | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/crypto/mac/ghash/builtin/CMakeLists.txt | 2 | ||||
| -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 | ||||
| -rw-r--r-- | src/protocols/ec25519_fhmqvc/CMakeLists.txt | 3 |
8 files changed, 7 insertions, 14 deletions
diff --git a/cmake/generate_version.cmake b/cmake/generate_version.cmake index bf69bac..e4a833c 100644 --- a/cmake/generate_version.cmake +++ b/cmake/generate_version.cmake @@ -10,3 +10,4 @@ add_custom_target( WORKING_DIRECTORY "${FASTD_SOURCE_DIR}" VERBATIM ) +set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${VERSION_FILE}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6b4dc92..286d3d7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ set_directory_properties(PROPERTIES COMPILE_DEFINITIONS _GNU_SOURCE) set(FASTD_CFLAGS "-Wall -pthread ${UECC_CFLAGS_OTHER} ${NACL_CFLAGS_OTHER}") -include_directories(${FASTD_SOURCE_DIR} ${FASTD_BINARY_DIR}/src ${CAP_INCLUDE_DIR} ${NACL_INCLUDE_DIRS}) +include_directories(${FASTD_SOURCE_DIR} ${FASTD_BINARY_DIR}/src) link_directories(${UECC_LIBRARY_DIRS} ${NACL_LIBRARY_DIRS}) @@ -41,6 +41,7 @@ add_executable(fastd ) set_property(TARGET fastd PROPERTY COMPILE_FLAGS "${FASTD_CFLAGS}") set_property(TARGET fastd PROPERTY LINK_FLAGS "-pthread ${UECC_LDFLAGS_OTHER} ${NACL_LDFLAGS_OTHER}") +target_include_directories(fastd PRIVATE ${CAP_INCLUDE_DIR} ${NACL_INCLUDE_DIRS}) target_link_libraries(fastd ${RT_LIBRARY} ${CAP_LIBRARY} ${UECC_LIBRARIES} ${NACL_LIBRARIES}) add_dependencies(fastd version) diff --git a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt index 60479ab..ab0d0e8 100644 --- a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt +++ b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt @@ -1,6 +1,5 @@ -include_directories(${FASTD_SOURCE_DIR} ${FASTD_BINARY_DIR}/src ${NACL_INCLUDE_DIRS}) - add_library(cipher_aes128_ctr_nacl OBJECT cipher_aes128_ctr_nacl.c ) -set_property(TARGET method_xsalsa20_poly1305 PROPERTY COMPILE_FLAGS "${FASTD_CFLAGS}") +set_property(TARGET cipher_aes128_ctr_nacl PROPERTY COMPILE_FLAGS "${FASTD_CFLAGS}") +target_include_directories(cipher_aes128_ctr_nacl PRIVATE ${NACL_INCLUDE_DIRS}) diff --git a/src/crypto/mac/ghash/builtin/CMakeLists.txt b/src/crypto/mac/ghash/builtin/CMakeLists.txt index 4e8208b..b7b862a 100644 --- a/src/crypto/mac/ghash/builtin/CMakeLists.txt +++ b/src/crypto/mac/ghash/builtin/CMakeLists.txt @@ -1,5 +1,3 @@ -include_directories(${FASTD_SOURCE_DIR} ${FASTD_BINARY_DIR}/src) - add_library(mac_ghash_builtin OBJECT ghash_builtin.c ) 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}) diff --git a/src/protocols/ec25519_fhmqvc/CMakeLists.txt b/src/protocols/ec25519_fhmqvc/CMakeLists.txt index d637a25..3edaf8f 100644 --- a/src/protocols/ec25519_fhmqvc/CMakeLists.txt +++ b/src/protocols/ec25519_fhmqvc/CMakeLists.txt @@ -1,5 +1,3 @@ -include_directories(${FASTD_SOURCE_DIR} ${FASTD_BINARY_DIR}/src ${UECC_INCLUDE_DIRS}) - add_library(protocol_ec25519_fhmqvc OBJECT ec25519_fhmqvc.c handshake.c @@ -7,3 +5,4 @@ add_library(protocol_ec25519_fhmqvc OBJECT util.c ) set_property(TARGET protocol_ec25519_fhmqvc PROPERTY COMPILE_FLAGS "${FASTD_CFLAGS}") +target_include_directories(protocol_ec25519_fhmqvc PRIVATE ${UECC_INCLUDE_DIRS}) |