add civetweb. (#997)

* add civetweb.

* civetweb: add on_test.

* civetweb: enable more feature, add link option for bsd, mingw.

* civetweb: try fix build on msys.

* civetweb: patch to fix platform mingw.

* civetweb: force link with ws2_32 for shared mingw build.

The need for this is because civetweb's FindWinSock.cmake is not
reliable.

* civetweb: fix patch.

Replacing ":" with ";" only on Unix systems.

* civetweb: use CMAKE_HOST_WIN32 in FindWinSock.

* Update xmake.lua

Co-authored-by: ruki <waruqi@gmail.com>
pull/999/head
Chen Yufei 3 years ago committed by GitHub
parent c62703f4ef
commit 3c499b1d0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 31
      packages/c/civetweb/patches/v1.15/find-winsock.patch
  2. 61
      packages/c/civetweb/xmake.lua

@ -0,0 +1,31 @@
diff --git a/cmake/FindWinSock.cmake b/cmake/FindWinSock.cmake
index 25c4f2fa..26753e5d 100644
--- a/cmake/FindWinSock.cmake
+++ b/cmake/FindWinSock.cmake
@@ -39,6 +39,7 @@ endmacro(REMOVE_DUPLICATE_PATHS)
set(WINSOCK_INCLUDE_PATHS "${WINSOCK_ROOT}/include/")
if(MINGW)
+ file(TOUCH ${CMAKE_BINARY_DIR}/nul)
execute_process(
COMMAND ${CMAKE_C_COMPILER} -xc -E -v -
RESULT_VARIABLE RESULT
@@ -71,7 +72,17 @@ if(MINGW)
)
if (NOT RESULT)
string(REGEX MATCH "libraries: =([^\r\n]*)" OUT "${OUT}")
- list(APPEND WINSOCK_LIBRARY_PATHS "${CMAKE_MATCH_1}")
+ if(CMAKE_HOST_WIN32)
+ message(STATUS "not replacing ${_SEARCH_PATHS}")
+ list(APPEND WINSOCK_LIBRARY_PATHS "${CMAKE_MATCH_1}")
+ else()
+ # On Unix-like host systems, search dirs are separated by ':'.
+ # Thus we need to replace ':' with ';' to make a valid cmake list.
+ string(REPLACE ":" ";" _SEARCH_PATHS "${CMAKE_MATCH_1}")
+ message(STATUS "after replace ${_SEARCH_PATHS}")
+ list(APPEND WINSOCK_LIBRARY_PATHS "${_SEARCH_PATHS}")
+ unset(_SEARCH_PATHS)
+ endif()
endif()
endif()
if ("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "AMD64" AND "${CMAKE_SIZEOF_VOID_P}" EQUAL 4)

@ -0,0 +1,61 @@
package("civetweb")
set_homepage("https://github.com/civetweb/civetweb")
set_description("Embedded C/C++ web server")
set_license("MIT")
add_urls("https://github.com/civetweb/civetweb/archive/refs/tags/$(version).tar.gz",
"https://github.com/civetweb/civetweb.git")
add_versions('v1.15', '90a533422944ab327a4fbb9969f0845d0dba05354f9cacce3a5005fa59f593b9')
add_patches("v1.15", path.join(os.scriptdir(), "patches", "v1.15", "find-winsock.patch"), "4d8355169fb20ede0fdae2a8bc8561238a088cf810e36107ba267f273989d9ee")
add_configs("openssl", {description = "with openssl library", default = false, type = "boolean"})
add_configs("zlib", {description = "Enable zlib support.", default = false, type = "boolean"})
add_deps("cmake")
if is_plat("linux") or is_plat("bsd") then
add_syslinks("pthread")
elseif is_plat("mingw", "windows") then
add_syslinks("ws2_32")
end
on_load(function (package)
local configdeps = {
openssl = "openssl",
zlib = "zlib",
}
for name, dep in pairs(configdeps) do
if package:config(name) then
package:add("deps", dep)
end
end
end)
on_install(function (package)
local configs = {
"-DCIVETWEB_BUILD_TESTING=OFF",
"-DCIVETWEB_ENABLE_DEBUG_TOOLS=OFF",
"-DCIVETWEB_ENABLE_CXX=ON",
"-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=OFF",
"-DCIVETWEB_ENABLE_WEBSOCKETS=ON",
"-DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF",
"-DCIVETWEB_ENABLE_IPV6=ON",
}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
table.insert(configs, "-DCIVETWEB_ENABLE_SSL=" .. (package:config("openssl") and "ON" or "OFF"))
table.insert(configs, "-DCIVETWEB_ENABLE_ZLIB=" .. (package:config("zlib") and "ON" or "OFF"))
-- make sure ws2_32 is always used even find-winsock doesn't work
if package:is_plat("mingw") and package:config("shared") then
io.replace("src/CMakeLists.txt", "if (WINSOCK_FOUND)", "if (TRUE)", {plain = true})
io.replace("src/CMakeLists.txt", "WINSOCK::WINSOCK", "ws2_32", {plain = true})
end
import("package.tools.cmake").install(package, configs)
end)
on_test(function (package)
assert(package:has_cfuncs("mg_start", {includes = "civetweb.h"}))
end)
Loading…
Cancel
Save