build: simplify cmake code

This commit is contained in:
dundargoc 2024-04-27 00:55:49 +02:00
parent e53686fea3
commit a26a91727d
3 changed files with 6 additions and 11 deletions

View File

@ -1,10 +1,8 @@
get_externalproject_options(wasmtime ${DEPS_IGNORE_SHA})
ExternalProject_Add(wasmtime
DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/wasmtime
CONFIGURE_COMMAND ""
BUILD_COMMAND cargo build --release -p wasmtime-c-api --target-dir ${DEPS_LIB_DIR}/wasmtime
INSTALL_COMMAND ""
BUILD_IN_SOURCE TRUE
SOURCE_SUBDIR crates/c-api
USES_TERMINAL_BUILD TRUE
CMAKE_ARGS ${DEPS_CMAKE_ARGS}
# CMAKE_CACHE_ARGS "WASMTIME_USER_CARGO_BUILD_OPTIONS:STRING=--target-dir ${DEPS_LIB_DIR}/wasmtime"
${EXTERNALPROJECT_OPTIONS})

View File

@ -60,5 +60,5 @@ TREESITTER_MARKDOWN_SHA256 4909d6023643f1afc3ab219585d4035b7403f3a17849782ab803c
TREESITTER_URL https://github.com/tree-sitter/tree-sitter/archive/v0.22.5.tar.gz
TREESITTER_SHA256 6bc22ca7e0f81d77773462d922cf40b44bfd090d92abac75cb37dbae516c2417
WASMTIME_URL https://github.com/bytecodealliance/wasmtime/archive/v20.0.0.tar.gz
WASMTIME_SHA256 9146c41340ba087b7b7257e53ccaba7ce6fed95b0f410ce7ba6e1b83547c29d5
WASMTIME_URL https://github.com/bytecodealliance/wasmtime/archive/356710deed6db80697d5fb1c6a41233b81d12fee.tar.gz
WASMTIME_SHA256 3bb1329d9c9155a3147c9bb687686f9683dff6e443b21344c664d505dffc2b45

View File

@ -1,8 +1,5 @@
find_path2(WASMTIME_INCLUDE_DIR wasmtime.h
PATHS ${DEPS_PREFIX}/../build/src/wasmtime/crates/c-api/include
)
find_library2(WASMTIME_LIBRARY wasmtime
PATH_SUFFIXES wasmtime/release/)
find_path2(WASMTIME_INCLUDE_DIR wasmtime.h)
find_library2(WASMTIME_LIBRARY wasmtime)
find_package_handle_standard_args(Wasmtime
REQUIRED_VARS WASMTIME_INCLUDE_DIR WASMTIME_LIBRARY)