octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

externals: require cpp-httplib >= 0.14.1 (#7043)

This commit is contained in:
Castor215 2023-10-06 00:41:07 +01:00 committed by GitHub
parent 053b3618dc
commit 7931aac3b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
externals/CMakeLists.txt vendored
View File

@ -209,8 +209,13 @@ endif()
# httplib # httplib
add_library(httplib INTERFACE) add_library(httplib INTERFACE)
if(USE_SYSTEM_CPP_HTTPLIB) if(USE_SYSTEM_CPP_HTTPLIB)
find_package(CppHttp REQUIRED) find_package(CppHttp 0.14.1)
target_link_libraries(httplib INTERFACE cpp-httplib::cpp-httplib) 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() else()
target_include_directories(httplib INTERFACE ./httplib) target_include_directories(httplib INTERFACE ./httplib)
endif() endif()

8
externals/cmake-modules/FindCppHttp.cmake vendored
View File

@ -15,13 +15,7 @@ if(NOT CppHttp_FOUND)
/usr/local/lib /usr/local/lib
) )
if(CPP-HTTP_INCLUDE_DIR AND CPP-HTTP_LIBRARIES) find_package_handle_standard_args(CppHttp REQUIRED_VARS CPP-HTTP_INCLUDE_DIR CPP-HTTP_LIBRARIES VERSION_VAR HTTP_TMP_VERSION)
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()
endif() endif()