From d7c1ec36d6622ed8eedcd65a19664afd2f0cd8f5 Mon Sep 17 00:00:00 2001 From: Paul Dino Jones Date: Sun, 29 Jan 2023 22:25:25 +0000 Subject: [PATCH] Add flag to compile full version of simapi --- CMakeLists.txt | 4 +--- src/gilles/gameloop/CMakeLists.txt | 3 +++ src/gilles/simulatorapi/CMakeLists.txt | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9350d7b..af825b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,10 +13,9 @@ endif() SET_SOURCE_FILES_PROPERTIES( src/gilles.c PROPERTIES LANGUAGE C) set(CMAKE_BUILD_TYPE Debug) - project(gilles) - set(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed -ldl") + find_package(eclipse-paho-mqtt-c REQUIRED) add_subdirectory(src/gilles/gameloop) @@ -27,7 +26,6 @@ add_subdirectory(src/gilles/slog) add_executable(gilles src/gilles/gilles.c) target_link_libraries(gilles m ncurses argtable2 config gameloop helper slog simulatorapi eclipse-paho-mqtt-c::paho-mqtt3c) - # used for enabling additional compiler options if supported include(CheckCXXCompilerFlag) diff --git a/src/gilles/gameloop/CMakeLists.txt b/src/gilles/gameloop/CMakeLists.txt index b720e09..d645471 100644 --- a/src/gilles/gameloop/CMakeLists.txt +++ b/src/gilles/gameloop/CMakeLists.txt @@ -6,4 +6,7 @@ set(gameloop_source_files set(LIBXML_INCLUDE_DIR /usr/include/libxml2) include_directories("." ${LIBXML_INCLUDE_DIR}) + add_library(gameloop STATIC ${gameloop_source_files}) + +target_compile_definitions(gameloop PRIVATE SIMMAP_ALL) diff --git a/src/gilles/simulatorapi/CMakeLists.txt b/src/gilles/simulatorapi/CMakeLists.txt index 07abbb2..8ca6420 100644 --- a/src/gilles/simulatorapi/CMakeLists.txt +++ b/src/gilles/simulatorapi/CMakeLists.txt @@ -13,3 +13,4 @@ set(simulatorapi_source_files ) add_library(simulatorapi STATIC ${simulatorapi_source_files}) +target_compile_definitions(simulatorapi PRIVATE SIMMAP_ALL)