patch cmake

xmake-io · Oct 15, 2024 · 0d1d44b · 0d1d44b
1 parent 0e01952
commit 0d1d44b
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/packages/l/ls-qpack/patches/2.5.5/cmake.patch b/packages/l/ls-qpack/patches/2.5.5/cmake.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 413b4579..f9f1371d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,14 +42,14 @@ else()
+ 	set(LSQPACK_DEPENDS "libxxhash")
+ endif()
+
+-if(WIN32)
++if(MSVC OR MINGW OR EMSCRIPTEN)
+     target_include_directories(ls-qpack PUBLIC
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/wincompat>
+         $<INSTALL_INTERFACE:include>
+     )
+ endif()
+
+-if(WIN32)
++if(MSVC)
+     target_compile_options(ls-qpack PRIVATE
+         /Wall
+         /wd4100 # unreffed parameter
+@@ -144,7 +144,7 @@ if(LSQPACK_BIN)
+           DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+
+-if(WIN32)
++if(MSVC OR MINGW OR EMSCRIPTEN)
+     install(DIRECTORY wincompat/sys DESTINATION include)
+ else()
+     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lsqpack.pc"
diff --git a/packages/l/ls-qpack/xmake.lua b/packages/l/ls-qpack/xmake.lua
@@ -10,7 +10,8 @@ package("ls-qpack")
     add_versions("v2.5.4", "56b96190a1943d75ef8d384b13cd4592a72e3e2d84284f78d7f8adabbc717f3e")
     add_versions("v2.5.3", "075a05efee27961eac5ac92a12a6e28a61bcd6c122a0276938ef993338577337")
 
-    add_patches("v2.5.3", "patches/v2.5.3/fix-cmake-install.patch", "7d819b620b5e2bd34ef58a91bf20d882883c7525def9f9f80313b64cba5e5239")
+    add_patches("2.5.5", "patches/2.5.5/cmake.patch", "23fd785c3db2e1b43ead464b0ee8d12e9f290fbfdf818c3238cba316df295f08")
+    add_patches("2.5.3", "patches/v2.5.3/fix-cmake-install.patch", "7d819b620b5e2bd34ef58a91bf20d882883c7525def9f9f80313b64cba5e5239")
 
     add_deps("cmake")
     add_deps("xxhash")
@@ -19,6 +20,8 @@ package("ls-qpack")
         if package:gitref() or package:version():ge("2.5.5") then
             if is_subhost("windows") then
                 package:add("deps", "pkgconf")
+            else
+                package:add("deps", "pkg-config")
             end
         end
     end)
@@ -31,7 +34,12 @@ package("ls-qpack")
             opt.packagedeps = "xxhash"
         end
 
-        local configs = {"-DLSQPACK_TESTS=OFF", "-DLSQPACK_BIN=OFF", "-DLSQPACK_XXH=OFF",}
+        local configs = {
+            "-DLSQPACK_TESTS=OFF",
+            "-DLSQPACK_BIN=OFF",
+            "-DLSQPACK_XXH=OFF",
+            "-DCMAKE_POLICY_DEFAULT_CMP0057=NEW",
+        }
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         if package:is_plat("windows") and package:config("shared") then