From 359e9b6c2b0cc4817b55338f0b89638945d98c50 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 24 Mar 2012 22:32:24 +0100 Subject: Rename methods to protocols; fix some command line parse bugs; implement most of the config file parser --- src/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1da7d13..bd97f31 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,12 +1,12 @@ -set(METHODS method_null.c) +set(PROTOCOLS protocol_null.c) set(FASTD_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${FASTD_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) set(FASTD_LIBS "") -if(WITH_METHOD_ECFXP) - set(METHODS ${METHODS} method_ec25519_fhmqvc_xsalsa20_poly1305.c) - set(FASTD_INCLUDES ${FASTD_INCLUDES} ${UECC_INCLUDE_DIR} ${NACL_INCLUDE_DIR}) - set(FASTD_LIBS ${FASTD_LIBS} ${UECC_LIBRARY} ${NACL_LIBRARY}) -endif(WITH_METHOD_ECFXP) +if(WITH_PROTOCOL_ECFXP) + list(APPEND PROTOCOLS protocol_ec25519_fhmqvc_xsalsa20_poly1305.c) + list(APPEND FASTD_INCLUDES ${UECC_INCLUDE_DIR} ${NACL_INCLUDE_DIR}) + list(APPEND FASTD_LIBS ${UECC_LIBRARY} ${NACL_LIBRARY}) +endif(WITH_PROTOCOL_ECFXP) include_directories(${FASTD_INCLUDES}) @@ -23,6 +23,6 @@ add_executable(fastd task.c ${FLEX_fastd_config_lex_OUTPUTS} ${BISON_fastd_config_parse_OUTPUTS} - ${METHODS} + ${PROTOCOLS} ) target_link_libraries(fastd rt ${FASTD_LIBS}) -- cgit v1.2.3