From 820e76108bc85051d64431495d70f27379756cc8 Mon Sep 17 00:00:00 2001 From: Julien Dessaux Date: Thu, 12 Sep 2019 18:05:01 +0200 Subject: Added liveapi support, and the maar tool (mark all as read) --- CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index f6d77ab..eed1733 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,13 +13,18 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") endif() -SET (CMAKE_C_COMPILER "clang") -set(CMAKE_C_FLAGS "-Wall -Werror -Wextra -pedantic -D_XOPEN_SOURCE=10000 -D_XOPEN_SOURCE_EXTENDED") +set(CMAKE_C_COMPILER "clang") +set(CMAKE_C_FLAGS "-Wall -Werror -Wextra -pedantic -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=10000 -D_XOPEN_SOURCE_EXTENDED -Wno-variadic-macros") set(CMAKE_C_FLAGS_DEBUG "-O0 -g -ggdb -pg -fsanitize=address") set(CMAKE_C_FLAGS_RELEASE "-O2") set(CMAKE_C_FLAGS_MinSizeRel "-Os") set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -ggdb -pg -fsanitize=address") +option(DEBUG_WEBSOCKETS "whether or not to print all incoming and outgoing websocket communications" OFF) +if(DEBUG_WEBSOCKETS) + add_definitions(-DDEBUG_WEBSOCKETS) +endif() + execute_process(COMMAND git rev-parse HEAD RESULT_VARIABLE GIT_HASH_RESULT OUTPUT_VARIABLE GIT_HASH_FULL) string(STRIP ${GIT_HASH_FULL} GIT_HASH) @@ -47,4 +52,6 @@ include_directories("${PROJECT_SOURCE_DIR}/external/uthash/src") ### Project subdirectories ##### add_subdirectory(close_direct_conversations) add_subdirectory(common) +add_subdirectory(liveapi) +add_subdirectory(maar) add_subdirectory(restapi) -- cgit v1.2.3