Skip to content

Make the HTTP server optional via ODR_WITH_HTTP_SERVER #601

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

Merged
andiwand merged 2 commits into from
Jul 11, 2026
Merged

Make the HTTP server optional via ODR_WITH_HTTP_SERVER #601

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
bbab044
Make the HTTP server optional via ODR_WITH_HTTP_SERVER
andiwand Jul 11, 2026
7fdd311
Wire ODR_WITH_HTTP_SERVER through conanfile.py
andiwand Jul 11, 2026
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
24 changes: 21 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
option(ODR_TEST "enable tests" OFF)
option(ODR_CLI "enable command line interface" ON)
option(ODR_WITH_HTTP_SERVER "Build the HTTP server (requires cpp-httplib)" ON)
Comment thread
andiwand marked this conversation as resolved.
option(ODR_CLANG_TIDY "Run clang-tidy static analysis" OFF)
option(WITH_PDF2HTMLEX "Deprecated: `ODR_WITH_PDF2HTMLEX` instead! Build with pdf2htmlEX" ON)
option(WITH_WVWARE "Deprecated: `ODR_WITH_WVWARE` instead! Build with wvWare" ON)
Expand Down Expand Up @@ -55,7 +56,6 @@ find_package(nlohmann_json REQUIRED)
find_package(vincentlaucsb-csv-parser REQUIRED)
find_package(uchardet REQUIRED)
find_package(utf8cpp REQUIRED)
find_package(httplib REQUIRED)
find_package(argon2 REQUIRED)

include(FetchContent)
Expand Down Expand Up @@ -89,7 +89,6 @@ set(ODR_SOURCE_FILES
"src/odr/filesystem.cpp"
"src/odr/global_params.cpp"
"src/odr/html.cpp"
"src/odr/http_server.cpp"
"src/odr/logger.cpp"
"src/odr/odr.cpp"
"src/odr/quantity.cpp"
Expand Down Expand Up @@ -257,7 +256,6 @@ target_link_libraries(odr
vincentlaucsb-csv-parser::vincentlaucsb-csv-parser
uchardet::uchardet
utf8::cpp
httplib::httplib
argon2::argon2
)

Expand Down Expand Up @@ -289,6 +287,21 @@ function(odr_require_data_path path name)
endif ()
endfunction()

if (ODR_WITH_HTTP_SERVER)
find_package(httplib REQUIRED)
target_sources(odr
PRIVATE
"src/odr/http_server.cpp"
)
target_link_libraries(odr
PRIVATE
httplib::httplib
)
target_compile_definitions(odr
PRIVATE
ODR_WITH_HTTP_SERVER
)
endif ()
if (ODR_WITH_PDF2HTMLEX)
find_package(pdf2htmlEX REQUIRED)
find_package(poppler REQUIRED)
Expand Down Expand Up @@ -397,10 +410,15 @@ if (ODR_CLANG_TIDY)
add_subdirectory("static_analysis/clang-tidy")
endif ()

if (NOT ODR_WITH_HTTP_SERVER)
# Don't ship the public header for an API that wasn't built.
set(ODR_HEADER_EXCLUDE PATTERN "http_server.hpp" EXCLUDE)
endif ()
install(
DIRECTORY src/ "${CMAKE_CURRENT_BINARY_DIR}/src/"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
FILES_MATCHING PATTERN "*.hpp"
${ODR_HEADER_EXCLUDE}
)
install(
TARGETS odr meta translate back_translate
Expand Down
22 changes: 12 additions & 10 deletions cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ target_include_directories(back_translate
../src
)

add_executable(server src/server.cpp)
target_link_libraries(server
PRIVATE
odr
httplib::httplib
)
target_include_directories(server
PRIVATE
../src
)
if (ODR_WITH_HTTP_SERVER)
add_executable(server src/server.cpp)
target_link_libraries(server
PRIVATE
odr
httplib::httplib
)
target_include_directories(server
PRIVATE
../src
)
endif ()
6 changes: 5 additions & 1 deletion conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class OpenDocumentCoreConan(ConanFile):
"with_pdf2htmlEX": [True, False],
"with_wvWare": [True, False],
"with_libmagic": [True, False],
"with_http_server": [True, False],
"bundle_assets": [True, False],
}
default_options = {
Expand All @@ -28,6 +29,7 @@ class OpenDocumentCoreConan(ConanFile):
"with_pdf2htmlEX": True,
"with_wvWare": True,
"with_libmagic": True,
"with_http_server": True,
"bundle_assets": False,
}

Expand All @@ -52,7 +54,8 @@ def requirements(self):
self.requires("pdf2htmlex/0.18.8.rc1-odr-git-732fd68")
if self.options.get_safe("with_wvWare", False):
self.requires("wvware/1.2.9-odr")
self.requires("cpp-httplib/0.16.3")
if self.options.get_safe("with_http_server", False):
self.requires("cpp-httplib/0.16.3")
self.requires("argon2/20190702-odr")
if self.options.get_safe("with_libmagic", False):
self.requires("libmagic/5.45")
Expand All @@ -75,6 +78,7 @@ def generate(self):
tc.variables["ODR_WITH_PDF2HTMLEX"] = self.options.get_safe("with_pdf2htmlEX", False)
tc.variables["ODR_WITH_WVWARE"] = self.options.get_safe("with_wvWare", False)
tc.variables["ODR_WITH_LIBMAGIC"] = self.options.get_safe("with_libmagic", False)
tc.variables["ODR_WITH_HTTP_SERVER"] = self.options.get_safe("with_http_server", False)
tc.variables["ODR_BUNDLE_ASSETS"] = self.options.get_safe("bundle_assets", False)

# Get runenv info, exported by package_info() of dependencies
Expand Down
Loading