Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch REST library from served to Crow #43

Open
wants to merge 2 commits into
base: feature/spdlog-logging
Choose a base branch
from
Open

Switch REST library from served to Crow #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d263584
removed served
ClemensElflein Dec 20, 2024
bb7efe0
Migrated from deprecated served to Crow
ClemensElflein Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "dependencies/served"]
path = dependencies/served
url = https://github.com/meltwater/served.git
8 changes: 2 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,8 @@ include_directories(${Boost_INCLUDE_DIR})
include_directories(${CUPS_INCLUDE_DIR})
include_directories(${Protobuf_INCLUDE_DIRS})
include_directories(${Protobuf_INCLUDE_DIR})
include_directories(dependencies/served/src)

OPTION (SERVED_BUILD_TESTS "Build served unit test suite" OFF)
OPTION (SERVED_BUILD_EXAMPLES "Build served examples" OFF)
add_subdirectory(dependencies/served)

add_subdirectory(dependencies/crow)
add_subdirectory(dependencies/spdlog)

if(USE_SPI)
Expand Down Expand Up @@ -85,7 +81,7 @@ target_link_libraries(self_o_mat.app ${Boost_LIBRARIES}
sfml-window
${OpenCV_LIBS}
${CUPS_LIBRARIES}
served
Crow
protobuf
spdlog::spdlog
)
Expand Down
7 changes: 7 additions & 0 deletions dependencies/crow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
include(FetchContent)
FetchContent_Declare(
Crow
GIT_REPOSITORY https://github.com/CrowCpp/Crow
GIT_TAG v1.2.0
)
FetchContent_MakeAvailable(Crow)
1 change: 0 additions & 1 deletion dependencies/served
Open in desktop
Submodule served deleted from 8ef95d
Loading
Loading