Skip to content

Commit 9474f46

Browse files
committed
update patch
1 parent 92adb13 commit 9474f46

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

deps/patches/proj_wasm.patch

+6-16
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
--- /cmake/project-config-version.cmake.in 2023-12-05 10:44:44
2-
+++ /cmake/project-config-version.cmake.in 2023-12-06 09:45:53
3-
@@ -22,45 +22,7 @@
4-
set (CMAKE_CROSSCOMPILING_STR "OFF")
1+
--- project-config-version.cmake.in 2024-08-28 10:50:19
2+
+++ project-config-version.cmake.in 2024-08-28 11:15:36
3+
@@ -15,35 +15,7 @@
4+
math (EXPR MSVC_TOOLSET_MAJOR "${MSVC_TOOLSET_VERSION}/10")
55
endif ()
6-
6+
77
-if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_VARIANT_NAME@")
88
- # Check package name (in particular, because of the way cmake finds
99
- # package config files, the capitalization could easily be "wrong").
@@ -25,16 +25,6 @@
2525
- # Reject if there's a mismatch in MSVC compiler versions
2626
- set (REASON "MSVC_TOOLSET_VERSION = @MSVC_TOOLSET_VERSION@")
2727
- set (PACKAGE_VERSION_UNSUITABLE TRUE)
28-
-elseif (NOT CMAKE_CROSSCOMPILING_STR STREQUAL "@CMAKE_CROSSCOMPILING_STR@")
29-
- # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING}
30-
- set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@")
31-
- set (PACKAGE_VERSION_UNSUITABLE TRUE)
32-
-elseif (CMAKE_CROSSCOMPILING AND
33-
- NOT (CMAKE_SYSTEM_NAME STREQUAL "@CMAKE_SYSTEM_NAME@" AND
34-
- CMAKE_SYSTEM_PROCESSOR STREQUAL "@CMAKE_SYSTEM_PROCESSOR@"))
35-
- # Reject if cross-compiling and there's a mismatch in the target system
36-
- set (REASON "target = @CMAKE_SYSTEM_NAME@-@CMAKE_SYSTEM_PROCESSOR@")
37-
- set (PACKAGE_VERSION_UNSUITABLE TRUE)
3828
-elseif (PACKAGE_FIND_VERSION)
3929
- if (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
4030
- set (PACKAGE_VERSION_EXACT TRUE)
@@ -44,6 +34,6 @@
4434
- endif ()
4535
-endif ()
4636
+set (PACKAGE_VERSION_COMPATIBLE TRUE)
47-
37+
4838
# If unsuitable, append the reason to the package version so that it's
4939
# visible to the user.

0 commit comments

Comments
 (0)