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.

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

Do not install httplib files #602

Merged
merged 1 commit into from
Sep 4, 2023
Merged
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
15 changes: 10 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,10 @@ include(CMakeFindDependencyMacro)

# Add cmake script directory.
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
set(CMAKE_MODULE_PATH "${EXTERNAL_DIR}/sanitizers-cmake/cmake"
${CMAKE_MODULE_PATH})
set(CMAKE_MODULE_PATH "${EXTERNAL_DIR}/sanitizers-cmake/cmake" ${CMAKE_MODULE_PATH})

# Do not install httplib files
set(HTTPLIB_INSTALL OFF)

# Required packages
find_package(OpenSSL REQUIRED)
Expand All @@ -112,7 +114,9 @@ add_subdirectory(${EXTERNAL_DIR}/cxxopts)
add_subdirectory(${EXTERNAL_DIR}/cpp-httplib)
add_subdirectory(${EXTERNAL_DIR}/json)
include_directories(
${EXTERNAL_DIR}/cpp-httplib
SYSTEM ${EXTERNAL_DIR}/cpp-httplib
)
include_directories(
${EXTERNAL_DIR}/simpleini
${EXTERNAL_DIR}/json/include
${EXTERNAL_DIR}/cxxopts/include
Expand Down Expand Up @@ -563,9 +567,10 @@ else(WIN32)
test/Main.cpp
)

add_dependencies(et-test TerminalCommon et-lib)
add_dependencies(et-test generated-code TerminalCommon et-lib)
target_link_libraries(
et-test
LINK_PUBLIC
TerminalCommon
et-lib
Catch2::Catch2WithMain
Expand All @@ -577,7 +582,7 @@ else(WIN32)
${Boost_LIBRARIES}
${CORE_LIBRARIES})
add_test(et-test et-test)
decorate_target(et-test)
add_sanitizers(et-test)
endif()

if(BUILD_TESTING AND FUZZING)
Expand Down
Loading