Merge remote-tracking branch 'origin/master' into httpc

externals/CMakeLists.txt

@@ -199,7 +199,12 @@ endif()
 
 # httplib
 add_library(httplib INTERFACE)
-target_include_directories(httplib SYSTEM INTERFACE ./httplib)
+if(USE_SYSTEM_CPP_HTTPLIB)
+    find_package(CppHttp REQUIRED)
+    target_link_libraries(httplib SYSTEM INTERFACE cpp-httplib::cpp-httplib)
+else()
+    target_include_directories(httplib SYSTEM INTERFACE ./httplib)
+endif()
 target_compile_options(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
 target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
 
@@ -216,7 +221,7 @@ if (ENABLE_WEB_SERVICE)
         target_link_libraries(cpp-jwt INTERFACE cpp-jwt::cpp-jwt)
     else()
         add_library(cpp-jwt INTERFACE)
-        target_include_directories(cpp-jwt INTERFACE ./cpp-jwt/include)
+        target_include_directories(cpp-jwt SYSTEM INTERFACE ./cpp-jwt/include)
         target_compile_definitions(cpp-jwt INTERFACE CPP_JWT_USE_VENDORED_NLOHMANN_JSON)
     endif()
 endif()

externals/cmake-modules/FindCppHttp.cmake

@@ -0,0 +1,35 @@
+if(NOT CppHttp_FOUND)
+    pkg_check_modules(HTTP_TMP cpp-httplib)
+
+    find_path(CPP-HTTP_INCLUDE_DIR NAMES httplib.h
+            PATHS
+            ${HTTP_TMP_INCLUDE_DIRS}
+            /usr/include
+            /usr/local/include
+        )
+		
+    find_library(CPP-HTTP_LIBRARIES NAMES cpp-httplib
+            PATHS
+            ${HTTP_TMP_LIBRARY_DIRS}
+            /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()
+	
+endif()
+
+if(CppHttp_FOUND AND 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 "${CPP-HTTP_INCLUDE_DIR}"
+        INTERFACE_LINK_LIBRARIES "${CPP-HTTP_LIBRARIES}"
+        IMPORTED_LOCATION "${CPP-HTTP_LIBRARIES}"
+    )
+endif()