diff options
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/crypto/mac/ghash/builtin/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/fastd_config.h.in (renamed from fastd_config.h.in) | 6 | ||||
| -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 | 2 | ||||
| -rw-r--r-- | src/protocols/ec25519_fhmqvc/CMakeLists.txt | 2 |
9 files changed, 23 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 70a17c9..c7e937c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,18 +136,4 @@ set(CMAKE_EXTRA_INCLUDE_FILES "netinet/if_ether.h") check_type_size("struct ethhdr" SIZEOF_ETHHDR) string(COMPARE NOTEQUAL "${SIZEOF_ETHHDR}" "" HAVE_ETHHDR) - -configure_file(${FASTD_SOURCE_DIR}/fastd_config.h.in ${FASTD_BINARY_DIR}/fastd_config.h) - -add_custom_target( - version - COMMAND echo "#ifndef _FASTD_VERSION_H_" > ${FASTD_BINARY_DIR}/fastd_version.h.new - COMMAND echo "#define _FASTD_VERSION_H_" >> ${FASTD_BINARY_DIR}/fastd_version.h.new - COMMAND sh -c "echo \"#define FASTD_VERSION \\\"$(git --git-dir=./.git describe --dirty 2>/dev/null || echo ${FASTD_VERSION})\\\"\"" >> ${FASTD_BINARY_DIR}/fastd_version.h.new - COMMAND echo "#endif /* _FASTD_VERSION_H_ */" >> ${FASTD_BINARY_DIR}/fastd_version.h.new - COMMAND cmp -s ${FASTD_BINARY_DIR}/fastd_version.h.new ${FASTD_BINARY_DIR}/fastd_version.h && rm ${FASTD_BINARY_DIR}/fastd_version.h.new || mv ${FASTD_BINARY_DIR}/fastd_version.h.new ${FASTD_BINARY_DIR}/fastd_version.h - WORKING_DIRECTORY "${FASTD_SOURCE_DIR}" - VERBATIM -) - add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ebc6c37..c6545e8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,15 +1,28 @@ set_directory_properties(PROPERTIES COMPILE_DEFINITIONS _GNU_SOURCE) set(FASTD_CFLAGS "-Wall -pthread ${UECC_CFLAGS_OTHER} ${NACL_CFLAGS_OTHER}") -include_directories(${FASTD_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CAP_INCLUDE_DIR} ${NACL_INCLUDE_DIRS}) +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CAP_INCLUDE_DIR} ${NACL_INCLUDE_DIRS}) link_directories(${UECC_LIBRARY_DIRS} ${NACL_LIBRARY_DIRS}) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fastd_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/fastd_config.h) + add_subdirectory(protocols) add_subdirectory(methods) add_subdirectory(crypto) +add_custom_target( + version + COMMAND echo "#ifndef _FASTD_FASTD_VERSION_H_" > ${CMAKE_CURRENT_BINARY_DIR}/fastd_version.h.new + COMMAND echo "#define _FASTD_FASTD_VERSION_H_" >> ${CMAKE_CURRENT_BINARY_DIR}/fastd_version.h.new + COMMAND sh -c "echo \"#define FASTD_VERSION \\\"$(git --git-dir=./.git describe --dirty 2>/dev/null || echo ${FASTD_VERSION})\\\"\"" >> ${CMAKE_CURRENT_BINARY_DIR}/fastd_version.h.new + COMMAND echo "#endif /* _FASTD_FASTD_VERSION_H_ */" >> ${CMAKE_CURRENT_BINARY_DIR}/fastd_version.h.new + COMMAND cmp -s ${CMAKE_CURRENT_BINARY_DIR}/fastd_version.h.new ${CMAKE_CURRENT_BINARY_DIR}/fastd_version.h && rm ${CMAKE_CURRENT_BINARY_DIR}/fastd_version.h.new || mv ${CMAKE_CURRENT_BINARY_DIR}/fastd_version.h.new ${CMAKE_CURRENT_BINARY_DIR}/fastd_version.h + WORKING_DIRECTORY "${FASTD_SOURCE_DIR}" + VERBATIM +) + BISON_TARGET(fastd_config_parse config.y ${CMAKE_CURRENT_BINARY_DIR}/config.yy.c) add_executable(fastd diff --git a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt index 50e4b4c..ecbca70 100644 --- a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt +++ b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR} ${NACL_INCLUDE_DIRS}) +include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR}/src ${NACL_INCLUDE_DIRS}) add_library(cipher_aes128_ctr_nacl OBJECT cipher_aes128_ctr_nacl.c diff --git a/src/crypto/mac/ghash/builtin/CMakeLists.txt b/src/crypto/mac/ghash/builtin/CMakeLists.txt index 7951d58..907c3dd 100644 --- a/src/crypto/mac/ghash/builtin/CMakeLists.txt +++ b/src/crypto/mac/ghash/builtin/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR}) +include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR}/src) add_library(mac_ghash_builtin OBJECT ghash_builtin.c diff --git a/fastd_config.h.in b/src/fastd_config.h.in index e347849..dd54033 100644 --- a/fastd_config.h.in +++ b/src/fastd_config.h.in @@ -24,8 +24,8 @@ */ -#ifndef _FASTD_CONFIG_H_ -#define _FASTD_CONFIG_H_ +#ifndef _FASTD_FASTD_CONFIG_H_ +#define _FASTD_FASTD_CONFIG_H_ #cmakedefine HAVE_AI_ADDRCONFIG #cmakedefine HAVE_ETHHDR @@ -49,4 +49,4 @@ #define MAX_CONFIG_DEPTH @MAX_CONFIG_DEPTH_NUM@ -#endif /* _FASTD_CONFIG_H_ */ +#endif /* _FASTD_FASTD_CONFIG_H_ */ diff --git a/src/methods/generic_gcm/CMakeLists.txt b/src/methods/generic_gcm/CMakeLists.txt index 1771ee0..732e7ed 100644 --- a/src/methods/generic_gcm/CMakeLists.txt +++ b/src/methods/generic_gcm/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR}) +include_directories(${FASTD_SOURCE_DIR}/src ${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 90ead47..0e68fec 100644 --- a/src/methods/null/CMakeLists.txt +++ b/src/methods/null/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR}) +include_directories(${FASTD_SOURCE_DIR}/src ${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 170a1ed..3c9e2cf 100644 --- a/src/methods/xsalsa20_poly1305/CMakeLists.txt +++ b/src/methods/xsalsa20_poly1305/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR} ${NACL_INCLUDE_DIRS}) +include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR}/src ${NACL_INCLUDE_DIRS}) add_library(method_xsalsa20_poly1305 OBJECT xsalsa20_poly1305.c diff --git a/src/protocols/ec25519_fhmqvc/CMakeLists.txt b/src/protocols/ec25519_fhmqvc/CMakeLists.txt index 48d2ef4..f39fba8 100644 --- a/src/protocols/ec25519_fhmqvc/CMakeLists.txt +++ b/src/protocols/ec25519_fhmqvc/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR} ${UECC_INCLUDE_DIRS}) +include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR}/src ${UECC_INCLUDE_DIRS}) add_library(protocol_ec25519_fhmqvc OBJECT ec25519_fhmqvc.c |