Skip to content

Commit 46b6e73

Browse files
committed
use patch files for vcpkg patching
1 parent 6bf9267 commit 46b6e73

3 files changed

Lines changed: 45 additions & 27 deletions

File tree

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/build-scripts/version.cmake b/build-scripts/version.cmake
2+
--- a/build-scripts/version.cmake
3+
+++ b/build-scripts/version.cmake
4+
@@ -13,10 +13,6 @@
5+
message("-- WAMR version: ${WAMR_VERSION_MAJOR}.${WAMR_VERSION_MINOR}.${WAMR_VERSION_PATCH}")
6+
7+
# Configure the version header file
8+
-configure_file(
9+
- ${WAMR_ROOT_DIR}/core/version.h.in
10+
- ${WAMR_ROOT_DIR}/core/version.h
11+
-)
12+
13+
# Set the library version and SOVERSION
14+
function(set_version_info target)
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
--- a/CMakeLists.txt
3+
+++ b/CMakeLists.txt
4+
@@ -10,7 +10,10 @@ if(ESP_PLATFORM)
5+
return()
6+
endif()
7+
8+
project (iwasm LANGUAGES C)
9+
+if (MSVC)
10+
+ enable_language(ASM_MASM)
11+
+endif ()
12+
13+
set(CMAKE_CXX_STANDARD 17)
14+
15+
@@ -24,7 +27,11 @@ endif ()
16+
set (CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
17+
set (CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
18+
19+
-set (CMAKE_C_STANDARD 99)
20+
+if (MSVC)
21+
+ set (CMAKE_C_STANDARD 11)
22+
+else ()
23+
+ set (CMAKE_C_STANDARD 99)
24+
+endif ()
25+
26+
# Set WAMR_BUILD_TARGET, currently values supported:
27+
# "X86_64", "AMD_64", "X86_32", "AARCH64[sub]", "ARM[sub]", "THUMB[sub]",

cmake/vcpkg-ports/wamr/portfile.cmake

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,11 @@ vcpkg_from_github(
55
REPO bytecodealliance/wasm-micro-runtime
66
REF 8c18e3f68b16c4bcaf05996b2636f6ed2b4cf629 # WAMR-2.4.4
77
SHA512 2378ab44e6ea3cd9bfede86a413c5d5503b8cd0d072bbee7099bd149897a58d74b57c06214f6b163242f5ac8bcdbb81a59632016ebd4c12a717786e1c387c9e3
8-
PATCHES remove-fetchcontent.patch
8+
PATCHES
9+
disable-configure-file.patch
10+
fix-msvc.patch
11+
remove-fetchcontent.patch
912
)
10-
file(READ "${SOURCE_PATH}/CMakeLists.txt" cmake_contents)
11-
string(REPLACE
12-
"project (iwasm LANGUAGES C)"
13-
"project (iwasm LANGUAGES C)\nif (MSVC)\n enable_language(ASM_MASM) # nolint\nendif ()"
14-
cmake_contents
15-
"${cmake_contents}"
16-
)
17-
string(REPLACE
18-
"set (CMAKE_C_STANDARD 99)"
19-
"if (MSVC)\n set (CMAKE_C_STANDARD 11)\nelse ()\n set (CMAKE_C_STANDARD 99)\nendif ()"
20-
cmake_contents
21-
"${cmake_contents}"
22-
)
23-
file(WRITE "${SOURCE_PATH}/CMakeLists.txt" "${cmake_contents}")
24-
25-
26-
27-
file(READ "${SOURCE_PATH}/build-scripts/version.cmake" version_cmake_contents)
28-
string(REGEX
29-
REPLACE "configure_file\\([^)]*\\)"
30-
"#configure_file_removed_by_vcpkg"
31-
version_cmake_contents
32-
"${version_cmake_contents}"
33-
)
34-
file(WRITE "${SOURCE_PATH}/build-scripts/version.cmake" "${version_cmake_contents}")
35-
3613

3714
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
3815
set(WAMR_BUILD_TARGET "X86_32")

0 commit comments

Comments
 (0)