From 252034be5ad9f6603eba1a4420002a319c7584e1 Mon Sep 17 00:00:00 2001 From: Sven Luethi Date: Tue, 11 Jun 2024 20:06:12 +0200 Subject: [PATCH] Move Plains binary creation from core module to main src dir --- src/CMakeLists.txt | 7 +++++++ src/core/CMakeLists.txt | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7883fcb..7b2d70f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +1,7 @@ +#cmake_minimum_required(VERSION 3.10) +#project(Plains) +#set(CMAKE_CXX_STANDARD 11) + add_subdirectory(core) add_subdirectory(resolver) add_subdirectory(dhcp) @@ -7,4 +11,7 @@ add_subdirectory(ui) add_subdirectory(dns) add_subdirectory(storage) +# Build Executable: +add_executable(Plains core/main.cpp) +target_link_libraries(Plains PRIVATE Core DNS Storage Resolver DHCP API Cluster UI) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 8fbf1da..0f7139e 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,4 +1,5 @@ +#add_library(Core OBJECT main.cpp EventBus.cpp ConfigManager.cpp Logger.cpp Exception.cpp) add_library(Core OBJECT EventBus.cpp ConfigManager.cpp Logger.cpp Exception.cpp) target_include_directories(Core PUBLIC include) @@ -7,8 +8,8 @@ target_include_directories(Core PUBLIC include) #add_subdirectory(storage) #add_subdirectory(tests) -# Build Executable: -add_executable(Plains main.cpp) -target_link_libraries(Plains PRIVATE Core DNS Storage Resolver DHCP API Cluster UI) +## Build Executable: +#add_executable(Plains main.cpp) +#target_link_libraries(Plains PRIVATE Core DNS Storage Resolver DHCP API Cluster UI)