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

externals: allow system cpp-cttplib to be used with both meson and cpp-httplib builds (#7062)

Browse Source 
Co-authored-by: Violet Purcell <vimproved@inventati.org>
This commit is contained in:
Castor215
2023-10-11 22:43:36 +01:00
committed by GitHub
parent 897d1fa957
commit 775a25b492
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals/CMakeLists.txt vendored
View File

@@ -230,7 +230,7 @@ add_library(httplib INTERFACE)
if(USE_SYSTEM_CPP_HTTPLIB) if(USE_SYSTEM_CPP_HTTPLIB)
find_package(CppHttp 0.14.1) find_package(CppHttp 0.14.1)
if(CppHttp_FOUND) if(CppHttp_FOUND)
target_link_libraries(httplib SYSTEM INTERFACE cpp-httplib::cpp-httplib) target_link_libraries(httplib INTERFACE httplib::httplib)
else() else()
message(STATUS "Cpp-httplib not found or not suitable version! Falling back to bundled...") message(STATUS "Cpp-httplib not found or not suitable version! Falling back to bundled...")
target_include_directories(httplib SYSTEM INTERFACE ./httplib) target_include_directories(httplib SYSTEM INTERFACE ./httplib)

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

@@ -1,21 +1,38 @@
if(NOT CppHttp_FOUND) if(NOT CppHttp_FOUND)
pkg_check_modules(HTTP_TMP cpp-httplib) pkg_check_modules(CPP_HTTPLIB cpp-httplib)
find_path(CPP-HTTP_INCLUDE_DIR NAMES httplib.h if (CPP_HTTPLIB_FOUND)
find_path(HTTPLIB_INCLUDE_DIR NAMES httplib.h
PATHS PATHS
${HTTP_TMP_INCLUDE_DIRS} ${CPP_HTTPLIB_INCLUDE_DIRS}
/usr/include /usr/include
/usr/local/include /usr/local/include
) )
find_library(CPP-HTTP_LIBRARIES NAMES cpp-httplib find_library(HTTPLIB_LIBRARY NAMES cpp-httplib
PATHS PATHS
${HTTP_TMP_LIBRARY_DIRS} ${CPP_HTTPLIB_LIBRARY_DIRS}
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
) )
find_package_handle_standard_args(CppHttp REQUIRED_VARS CPP-HTTP_INCLUDE_DIR CPP-HTTP_LIBRARIES VERSION_VAR HTTP_TMP_VERSION) set(HTTPLIB_VERSION ${CPP_HTTPLIB_VERSION})
if (NOT TARGET cpp-httplib::cpp-httplib)
add_library(cpp-httplib::cpp-httplib INTERFACE IMPORTED)
set_target_properties(cpp-httplib::cpp-httplib PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${HTTPLIB_INCLUDE_DIR}"
INTERFACE_LINK_LIBRARIES "${HTTPLIB_LIBRARY}"
IMPORTED_LOCATION "${HTTPLIB_LIBRARY}"
)
add_library(httplib::httplib ALIAS cpp-httplib::cpp-httplib)
endif()
else()
message(STATUS "Cpp-httplib not found via pkg-config, trying CMake...")
find_package(httplib)
endif()
find_package_handle_standard_args(CppHttp REQUIRED_VARS HTTPLIB_INCLUDE_DIR HTTPLIB_LIBRARY VERSION_VAR HTTPLIB_VERSION)
endif() endif()