replace crow submodule with header-only impl

This commit is contained in:
James Ravenscroft 2023-08-04 22:48:11 +01:00
parent 21b3fa5415
commit c48cd786ed
7 changed files with 12648 additions and 10 deletions

View File

@ -1 +1,2 @@
ggml/build ggml/build
build

3
.gitmodules vendored
View File

@ -7,6 +7,3 @@
[submodule "extern/sbdlog"] [submodule "extern/sbdlog"]
path = extern/spdlog path = extern/spdlog
url = https://github.com/gabime/spdlog.git url = https://github.com/gabime/spdlog.git
[submodule "extern/crow"]
path = extern/crow
url = https://github.com/CrowCpp/Crow.git

View File

@ -29,8 +29,8 @@ endif()
add_subdirectory(extern/ggml) add_subdirectory(extern/ggml)
add_subdirectory(extern/argparse) add_subdirectory(extern/argparse)
#add_subdirectory(extern/spdlog) add_subdirectory(extern/spdlog)
add_subdirectory(extern/crow)
add_subdirectory(src) add_subdirectory(src)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

1
extern/crow vendored

@ -1 +0,0 @@
Subproject commit 4f3f5deaaa01825c63c83431bfa96ccec195f741

12643
include/turbopilot/crow_all.h Normal file

File diff suppressed because it is too large Load Diff

View File

@ -24,7 +24,5 @@ target_include_directories(${TURBOPILOT_TARGET} PRIVATE
target_link_libraries(${TURBOPILOT_TARGET} PRIVATE ggml argparse) target_link_libraries(${TURBOPILOT_TARGET} PRIVATE ggml argparse)
target_link_libraries(${TURBOPILOT_TARGET} PUBLIC Crow::Crow)
#target_link_libraries(${TURBOPILOT_TARGET} PRIVATE spdlog::spdlog_header_only) #target_link_libraries(${TURBOPILOT_TARGET} PRIVATE spdlog::spdlog_header_only)

View File

@ -4,7 +4,7 @@
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <crow.h> #include <turbopilot/crow_all.h>
#include <argparse/argparse.hpp> #include <argparse/argparse.hpp>