Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ target_link_libraries(osr
boost-iostreams
)

set(ABS_TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/test")

# --- MAIN ---
add_executable(osr-extract exe/extract.cc)
target_link_libraries(osr-extract osr)
Expand All @@ -139,6 +141,9 @@ file(GLOB_RECURSE osr-backend-src exe/backend/*.cc)
add_executable(osr-backend ${osr-backend-src})
target_link_libraries(osr-backend osr web-server conf boost-json)
target_include_directories(osr-backend PRIVATE exe/backend/include)
target_compile_definitions(osr-backend PRIVATE
TEST_DATA_DIR="${ABS_TEST_DATA_DIR}"
)

# --- TEST ---
configure_file(
Expand All @@ -147,8 +152,11 @@ configure_file(
)
file(GLOB_RECURSE osr-test-files test/*cc)
add_executable(osr-test ${osr-test-files})
target_include_directories(osr-test PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/generated)
target_include_directories(osr-test PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/generated test/include)
target_link_libraries(osr-test gmock osr boost-json)
target_compile_definitions(osr-test PRIVATE
TEST_DATA_DIR="${ABS_TEST_DATA_DIR}"
)

# --- MIMALLOC ---
if (OSR_MIMALLOC)
Expand Down
3 changes: 2 additions & 1 deletion exe/backend/include/osr/backend/http_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ struct http_server {
lookup const&,
platforms const*,
elevation_storage const*,
std::string const& static_file_path);
std::string const& static_file_path,
bool provide_test_features);
~http_server();
http_server(http_server const&) = delete;
http_server& operator=(http_server const&) = delete;
Expand Down
Loading
Loading