diff --git a/CMakeLists.txt b/CMakeLists.txt index b3cd0b8..d577e3e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,16 +119,16 @@ if(NOT wasiclang_POPULATED) FetchContent_Populate(wasiclang) endif() -FetchContent_Declare( - mod_wasm2c - GIT_REPOSITORY https://github.com/WebAssembly/wabt/ - GIT_TAG main) -FetchContent_GetProperties(mod_wasm2c) -if(NOT mod_wasm2c_POPULATED) - FetchContent_Populate(mod_wasm2c) -endif() +# FetchContent_Declare( +# mod_wasm2c +# GIT_REPOSITORY https://github.com/WebAssembly/wabt/ +# GIT_TAG main) +# FetchContent_GetProperties(mod_wasm2c) +# if(NOT mod_wasm2c_POPULATED) +# FetchContent_Populate(mod_wasm2c) +# endif() -# set (mod_wasm2c_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../wabt/") +set (mod_wasm2c_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../wabt/") if(DEV) if(MSVC) @@ -213,8 +213,10 @@ if(DEV) add_link_options(${RLBOX_SANITIZER_LINK_FLAGS}) endif() -set(WASM2C_RUNTIME_CODE ${WASM2C_RUNTIME_SOURCE_DIR}/wasm-rt-impl.c ${CMAKE_SOURCE_DIR}/src/wasm2c_rt_minwasi.c ${CMAKE_SOURCE_DIR}/src/wasm2c_rt_mem.c) -list(FILTER WASM2C_RUNTIME_CODE EXCLUDE REGEX "${WASM2C_RUNTIME_SOURCE_DIR}/examples/.*" ) +set(WASM2C_RUNTIME_CODE ${WASM2C_RUNTIME_SOURCE_DIR}/wasm-rt-impl.c + ${WASM2C_RUNTIME_SOURCE_DIR}/wasm-rt-mem-impl.c + ${CMAKE_SOURCE_DIR}/src/wasm2c_rt_minwasi.c + ${CMAKE_SOURCE_DIR}/src/wasm2c_rt_mem.c) add_library(glue_lib STATIC ${GLUE_LIB_C} ${WASM2C_RUNTIME_CODE}) target_include_directories(glue_lib PRIVATE ${mod_wasm2c_SOURCE_DIR}/wasm2c