From 4beac7a986003c66a98d8dd72d64169089afdba7 Mon Sep 17 00:00:00 2001 From: Jay Robson Date: Thu, 18 Apr 2024 11:31:19 +1000 Subject: [PATCH] improve build system --- .gitmodules | 3 +++ CMakeLists.txt | 2 +- src/CMakeLists.txt | 3 +++ cpp-httplib => src/cpp-httplib | 0 src/main.cpp | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 src/CMakeLists.txt rename cpp-httplib => src/cpp-httplib (100%) diff --git a/.gitmodules b/.gitmodules index efafc10..4b8b1e9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "matrix-commander"] path = matrix-commander url = https://github.com/8go/matrix-commander +[submodule "src/cpp-httplib"] + path = src/cpp-httplib + url = https://github.com/yhirose/cpp-httplib diff --git a/CMakeLists.txt b/CMakeLists.txt index e47107a..57b9faa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ endif() message("Using cmake flags: ${CMAKE_CXX_FLAGS}") -file(GLOB_RECURSE SOURCES src/*.cpp) +include(src/CMakeLists.txt) add_executable(Portfolio ${SOURCES}) target_link_libraries(Portfolio PUBLIC stdc++ jsoncpp) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..9e9179d --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,3 @@ + +file(GLOB SOURCES src/*.cpp) + diff --git a/cpp-httplib b/src/cpp-httplib similarity index 100% rename from cpp-httplib rename to src/cpp-httplib diff --git a/src/main.cpp b/src/main.cpp index 0780e97..d4b2ebd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,5 @@ -#include "../cpp-httplib/httplib.h" +#include "cpp-httplib/httplib.h" #include "files.hpp" #include "contact.hpp"