refactor: update CMake configurations for custom section tests and wasm-apps build process

Author: lum1n0us

tests/unit/custom-section/CMakeLists.txt

@@ -2,9 +2,23 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 cmake_minimum_required(VERSION 3.14)
-
 project (test-custom-section)
 
+set(WASI_SDK_DIR "/opt/wasi-sdk")
+set(WASISDK_TOOLCHAIN "${WASI_SDK_DIR}/share/cmake/wasi-sdk.cmake")
+
+include(ExternalProject)
+ExternalProject_Add(
+  custom-section-test-wasm-apps
+  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/wasm-apps
+  BUILD_ALWAYS YES
+  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 --verbose
+  INSTALL_COMMAND   ${CMAKE_COMMAND} --install build --prefix ${CMAKE_CURRENT_BINARY_DIR}/wasm-apps
+)
+
 add_definitions (-DRUN_ON_LINUX)
 
 set (WAMR_BUILD_LIBC_WASI 0)
@@ -37,9 +51,6 @@ set (unit_test_sources
   ${IWASM_COMPL_SOURCE}
 )
 
-# Automatically build wasm-apps for this test
-add_subdirectory(wasm-apps)
-
 # Now simply link against gtest or gtest_main as needed. Eg
 add_executable (custom_section_test ${unit_test_sources})
 

tests/unit/custom-section/wasm-apps/CMakeLists.txt

@@ -2,13 +2,20 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 cmake_minimum_required(VERSION 3.14)
+project(wasm-apps)
 
-project(wasm-apps-custom-section)
+add_executable(app.wasm app.c)
+target_compile_options(app.wasm PUBLIC -g -nostdlib)
+target_link_options(app.wasm PRIVATE
+  -nostdlib
+  LINKER:--allow-undefined
+  LINKER:--export-all
+  LINKER:--no-entry
+)
 
-# Add -g option so there will be debugger related custom sections
-add_custom_target(app.wasm ALL
-    COMMAND /opt/wasi-sdk/bin/clang -g -nostdlib
-            -Wl,--no-entry,--export-all
-            -o ${CMAKE_CURRENT_BINARY_DIR}/app.wasm
-            ${CMAKE_CURRENT_LIST_DIR}/app.c
+# install .wasm
+set(
+  WASM_FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/app.wasm
 )
+install(FILES ${WASM_FILES} DESTINATION .)