externals: require cpp-httplib >= 0.14.1 (#7043)
This commit is contained in:
parent
053b3618dc
commit
7931aac3b7
|
@ -209,8 +209,13 @@ endif()
|
|||
# httplib
|
||||
add_library(httplib INTERFACE)
|
||||
if(USE_SYSTEM_CPP_HTTPLIB)
|
||||
find_package(CppHttp REQUIRED)
|
||||
target_link_libraries(httplib INTERFACE cpp-httplib::cpp-httplib)
|
||||
find_package(CppHttp 0.14.1)
|
||||
if(CppHttp_FOUND)
|
||||
target_link_libraries(httplib INTERFACE cpp-httplib::cpp-httplib)
|
||||
else()
|
||||
message(STATUS "Cpp-httplib not found or not suitable version! Falling back to bundled...")
|
||||
target_include_directories(httplib INTERFACE ./httplib)
|
||||
endif()
|
||||
else()
|
||||
target_include_directories(httplib INTERFACE ./httplib)
|
||||
endif()
|
||||
|
|
|
@ -14,14 +14,8 @@ if(NOT CppHttp_FOUND)
|
|||
/usr/lib
|
||||
/usr/local/lib
|
||||
)
|
||||
|
||||
if(CPP-HTTP_INCLUDE_DIR AND CPP-HTTP_LIBRARIES)
|
||||
set(CppHttp_FOUND TRUE CACHE INTERNAL "cpp-httplib found")
|
||||
message(STATUS "Found cpp-httplib: ${CPP-HTTP_INCLUDE_DIR}, ${CPP-HTTP_LIBRARIES}")
|
||||
else()
|
||||
set(CppHttp_FOUND FALSE CACHE INTERNAL "cpp-httplib found")
|
||||
message(STATUS "Cpp-httplib not found.")
|
||||
endif()
|
||||
|
||||
find_package_handle_standard_args(CppHttp REQUIRED_VARS CPP-HTTP_INCLUDE_DIR CPP-HTTP_LIBRARIES VERSION_VAR HTTP_TMP_VERSION)
|
||||
|
||||
endif()
|
||||
|
||||
|
|
Reference in New Issue