refactor: enhance CMake configurations for better build output and module support

Author: lum1n0us

.github/workflows/compilation_on_android_ubuntu.yml

@@ -368,8 +368,8 @@ jobs:
         run: |
           mkdir build && cd build
           cmake .. -DWAMR_BUILD_TARGET=${{ matrix.build_target }}
-          cmake --build . --config Release --parallel 4
-          ctest
+          cmake --build . --parallel 4
+          ctest --output-on-failure
         working-directory: tests/unit
 
   build_regression_tests:

tests/unit/compilation/CMakeLists.txt

@@ -14,6 +14,8 @@ add_definitions (-DWASM_ENABLE_DUMP_CALL_STACK=1)
 add_definitions (-DWASM_ENABLE_AOT_STACK_FRAME=1)
 
 set (WAMR_BUILD_LIBC_WASI 0)
+set (WAMR_BUILD_LIBC_BUILTIN 1)
+set (WAMR_BUILD_MULTI_MODULE 1)
 set (WAMR_BUILD_APP_FRAMEWORK 0)
 set (WAMR_BUILD_THREAD_MGR 1)
 set (WAMR_BUILD_AOT 1)

tests/unit/libc-builtin/CMakeLists.txt

@@ -14,6 +14,8 @@ set (WAMR_BUILD_JIT 0)
 set (WAMR_BUILD_LIBC_BUILTIN 1)
 set (WAMR_BUILD_LIBC_WASI 0)
 set (WAMR_BUILD_APP_FRAMEWORK 0)
+# FIXME: if removed, LibcBuiltinTest.calloc will be failed
+set (WAMR_BUILD_MULTI_MODULE 1)
 
 include (../unit_common.cmake)
 

tests/unit/running-modes/CMakeLists.txt

@@ -16,16 +16,19 @@ ExternalProject_Add(
   CONFIGURE_COMMAND ${CMAKE_COMMAND} -S ${CMAKE_CURRENT_SOURCE_DIR}/wasm-apps -B build
                       -DWASI_SDK_PREFIX=${WASI_SDK_DIR}
                       -DCMAKE_TOOLCHAIN_FILE=${WASISDK_TOOLCHAIN}
-  BUILD_COMMAND     ${CMAKE_COMMAND} --build build
+  BUILD_COMMAND     ${CMAKE_COMMAND} --build build --verbose
   INSTALL_COMMAND   ${CMAKE_COMMAND} --install build --prefix ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 add_definitions(-DRUN_ON_LINUX)
 
-set(WAMR_BUILD_LIBC_WASI 1)
+set(WAMR_BUILD_LIBC_BUILTIN 1)
+set(WAMR_BUILD_MULTI_MODULE 0)
+set(WAMR_BUILD_LIBC_WASI 0)
 set(WAMR_BUILD_APP_FRAMEWORK 0)
 set(WAMR_BUILD_JIT 1)
 set(WAMR_BUILD_FAST_JIT 1)
+set(WAMR_BUILD_REF_TYPES 1)
 
 # if only load this CMake other than load it as subdirectory
 include(../unit_common.cmake)

tests/unit/running-modes/wasm-apps/CMakeLists.txt

@@ -4,33 +4,30 @@
 cmake_minimum_required(VERSION 3.14)
 project(wasm-apps)
 
-# set(CMAKE_C_FLAGS "-nostdlib -pthread -Qunused-arguments")
-# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -z stack-size=8192 -nostdlib")
-
 add_executable(mytest.wasm mytest.c)
-target_link_libraries(mytest.wasm)
-target_compile_options(mytest.wasm PRIVATE
-  -pthread
-)
+target_compile_options(mytest.wasm PUBLIC -nostdlib)
 target_link_options(mytest.wasm PRIVATE
+  -nostdlib
   LINKER:--allow-undefined
   LINKER:--export-all
+  LINKER:--initial-memory=131072
   LINKER:--no-entry
 )
 
 add_executable(hello.wasm hello.c)
-target_link_libraries(hello.wasm)
-
-add_custom_command(TARGET hello.wasm POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy
-        ${CMAKE_CURRENT_BINARY_DIR}/hello.wasm
-        ${CMAKE_CURRENT_BINARY_DIR}/../
-        COMMENT "Copy hello.wasm to the same directory of google test"
-        )
+target_compile_options(hello.wasm PUBLIC -nostdlib)
+target_link_options(hello.wasm PRIVATE
+  -nostdlib
+  LINKER:--allow-undefined
+  LINKER:--export-all
+  LINKER:--initial-memory=131072
+  LINKER:--no-entry
+)
 
-add_custom_command(TARGET mytest.wasm POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy
-        ${CMAKE_CURRENT_BINARY_DIR}/mytest.wasm
-        ${CMAKE_CURRENT_BINARY_DIR}/../
-        COMMENT "Copy mytest.wasm to the same directory of google test"
-        )
+# install .wasm
+set(
+  WASM_FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/hello.wasm
+  ${CMAKE_CURRENT_BINARY_DIR}/mytest.wasm
+)
+install(FILES ${WASM_FILES} DESTINATION .)

tests/unit/runtime-common/CMakeLists.txt

@@ -13,6 +13,7 @@ set (WAMR_BUILD_INTERP 0)
 # to involve LLVM
 set (WAMR_BUILD_JIT 1)
 set (WAMR_BUILD_LIBC_WASI 0)
+set (WAMR_BUILD_LIBC_BUILTIN 1)
 set (WAMR_BUILD_APP_FRAMEWORK 0)
 set (WAMR_BUILD_MULTI_MODULE 1)
 

tests/unit/wasm-vm/CMakeLists.txt

@@ -11,6 +11,7 @@ set(WAMR_BUILD_AOT 0)
 set(WAMR_BUILD_FAST_INTERP 0)
 set(WAMR_BUILD_INTERP 1)
 set(WAMR_BUILD_JIT 0)
+set(WAMR_BUILD_LIBC_BUILTIN 1)
 
 add_definitions (-Dattr_container_malloc=malloc)
 add_definitions (-Dattr_container_free=free)