A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Improve c-api behavior when used as a CMake subproject (#13157)
Aki-nyan9d086714cbe1
diff --git a/crates/c-api/CMakeLists.txt b/crates/c-api/CMakeLists.txtindex a6e0bd0164..977d49bdd3 100644--- a/crates/c-api/CMakeLists.txt+++ b/crates/c-api/CMakeLists.txt@@ -6,6 +6,7 @@ option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)option(BUILD_TESTS "Build tests" OFF)option(WASMTIME_ALWAYS_BUILD "If cmake should always invoke cargo to build wasmtime" ON)option(WASMTIME_FASTEST_RUNTIME "Set flags designed to optimize runtime performance" OFF)+option(WASMTIME_ALWAYS_INSTALL "Always install artifacts, even if wasmtime is a subproject" OFF)set(WASMTIME_TARGET "" CACHE STRING "Rust target to build for")if(WASMTIME_TARGET STREQUAL "")@@ -15,6 +16,18 @@ if(WASMTIME_TARGET STREQUAL "")set(WASMTIME_TARGET ${RUSTC_HOST_TARGET})endif()+# Check to see if we are being built as part of a vendored dependency+# NOTE:+# CMake >=3.21 has `PROJECT_IS_TOP_LEVEL`, which would be nice to use,+# however for compatibility this is the best workaround.+#+# Also, you can't inline the `if` condition into the set, because CMake+if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)+ set(WASMTIME_IS_VENDORED FALSE)+else()+ set(WASMTIME_IS_VENDORED TRUE)+endif()+include(cmake/features.cmake)if(WASMTIME_FASTEST_RUNTIME)@@ -118,18 +131,31 @@ target_include_directories(wasmtimeconfigure_file(include/wasmtime/conf.h.in include/wasmtime/conf.h)include(GNUInstallDirs)-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ TYPE INCLUDE)-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ TYPE INCLUDE- FILES_MATCHING REGEX "\\.hh?$")-install(FILES ${WASMTIME_SHARED_FILES} ${WASMTIME_STATIC_FILES}- DESTINATION ${CMAKE_INSTALL_LIBDIR})+# Install the headers and static objects if:+# * wasmtime is vendored, and `WASMTIME_ALWAYS_INSTALL` is set+# * wasmtime is not vendored+if((NOT WASMTIME_IS_VENDORED) OR WASMTIME_ALWAYS_INSTALL)+ message("Installing wasmtime headers and static library")+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ TYPE INCLUDE)+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ TYPE INCLUDE+ FILES_MATCHING REGEX "\\.hh?$")+ install(FILES ${WASMTIME_STATIC_FILES} DESTINATION ${CMAKE_INSTALL_LIBDIR})+endif()-if(WASMTIME_TARGET MATCHES "apple")- # Postprocess the macOS dylib a bit to have a more reasonable `LC_ID_DYLIB`- # directive than the default one that comes out of the linker when typically- # doing `cargo build`. For more info see #984- set(INSTALLED_LIB ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libwasmtime.dylib)- install(CODE "execute_process(COMMAND install_name_tool -id \"@rpath/libwasmtime.dylib\" ${INSTALLED_LIB})")+# Install the shared objects if:+# * wasmtime is vendored and shared libraries are enabled+# * wasmtime is vendored, shared libraries are not enabled, but `WASMTIME_ALWAYS_INSTALL` is set+# * wasmtime is not vendored+if((WASMTIME_IS_VENDORED AND BUILD_SHARED_LIBS) OR ((NOT WASMTIME_IS_VENDORED) OR WASMTIME_ALWAYS_INSTALL))+ message("Installing wasmtime shared library")+ install(FILES ${WASMTIME_SHARED_FILES} DESTINATION ${CMAKE_INSTALL_LIBDIR})+ if(WASMTIME_TARGET MATCHES "apple")+ # Postprocess the macOS dylib a bit to have a more reasonable `LC_ID_DYLIB`+ # directive than the default one that comes out of the linker when typically+ # doing `cargo build`. For more info see #984+ set(INSTALLED_LIB ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libwasmtime.dylib)+ install(CODE "execute_process(COMMAND install_name_tool -id \"@rpath/libwasmtime.dylib\" ${INSTALLED_LIB})")+ endif()endif()set(DOXYGEN_CONF_IN ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf.in)diff --git a/crates/c-api/include/wasmtime.h b/crates/c-api/include/wasmtime.hindex 135959b004..0e0a969a08 100644--- a/crates/c-api/include/wasmtime.h+++ b/crates/c-api/include/wasmtime.h@@ -48,6 +48,15 @@* shared library instead. You must distribute the appropriate shared library* for your platform if you do this.*+ * The `WASMTIME_ALWAYS_INSTALL` variable is provided as when used as a+ * subproject, the default behaviour is to not install any of the headers or+ * static libraries. So as to provide them as installation artifacts for users+ * who still wish to have them, this will re-enable their install, even if used+ * as a subproject.+ *+ * If `BUILD_SHARED_LIBS` is set, even as a subproject the shared objects will+ * be added to the installation artifacts as not to cause any breakages.+ ** ## Linking against the C API** You'll want to arrange the `include` directory of the C API to be in your