Skip to content

use list(APPEND ... where appropriate #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexcrichton merged 1 commit into from
Oct 2, 2026
Merged

use list(APPEND ... where appropriate #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
run: ./ci/docker-build.sh ${{ matrix.artifact }}
if: runner.os == 'Linux'

# Setup the VS Developoer Prompt environment variables to explicitly use
# Setup the VS Developer Prompt environment variables to explicitly use
# MSVC to compile LLVM as that avoids extra runtime dependencies
# msys/mingw might bring.
#
Expand Down
14 changes: 7 additions & 7 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,17 @@ function(add_testcase test)

# Apply test-specific compile options and link flags.
if(${arg_EMULATED_CLOCKS})
set(so_files ${so_files} "${wasi_sysroot}/lib/${target}/libwasi-emulated-process-clocks.so")
list(APPEND so_files "${wasi_sysroot}/lib/${target}/libwasi-emulated-process-clocks.so")
target_compile_options(${target_name} PRIVATE -D_WASI_EMULATED_PROCESS_CLOCKS)
target_link_options(${target_name} PRIVATE -lwasi-emulated-process-clocks)
endif()
if(${arg_EMULATED_MMAN})
set(so_files ${so_files} "${wasi_sysroot}/lib/${target}/libwasi-emulated-mman.so")
list(APPEND so_files "${wasi_sysroot}/lib/${target}/libwasi-emulated-mman.so")
target_compile_options(${target_name} PRIVATE -D_WASI_EMULATED_MMAN)
target_link_options(${target_name} PRIVATE -lwasi-emulated-mman)
endif()
if(${arg_EMULATED_SIGNAL})
set(so_files ${so_files} "${wasi_sysroot}/lib/${target}/libwasi-emulated-signal.so")
list(APPEND so_files "${wasi_sysroot}/lib/${target}/libwasi-emulated-signal.so")
target_compile_options(${target_name} PRIVATE -D_WASI_EMULATED_SIGNAL)
target_link_options(${target_name} PRIVATE -lwasi-emulated-signal)
endif()
Expand All @@ -113,20 +113,20 @@ function(add_testcase test)
# Apply language-specific options and dependencies.
if(test MATCHES "cc$")
if(WASI_SDK_EXCEPTIONS STREQUAL "DUAL")
set(so_files ${so_files}
list(APPEND so_files
"${wasi_sysroot}/lib/${target}/eh/libc++.so"
"${wasi_sysroot}/lib/${target}/eh/libc++abi.so")
else()
set(so_files ${so_files}
list(APPEND so_files
"${wasi_sysroot}/lib/${target}/libc++.so"
"${wasi_sysroot}/lib/${target}/libc++abi.so")
endif()

if(NOT (WASI_SDK_EXCEPTIONS STREQUAL "OFF"))
if(WASI_SDK_EXCEPTIONS STREQUAL "DUAL")
set(so_files ${so_files} "${wasi_sysroot}/lib/${target}/eh/libunwind.so")
list(APPEND so_files "${wasi_sysroot}/lib/${target}/eh/libunwind.so")
else()
set(so_files ${so_files} "${wasi_sysroot}/lib/${target}/libunwind.so")
list(APPEND so_files "${wasi_sysroot}/lib/${target}/libunwind.so")
endif()

target_compile_options(${target_name} PRIVATE -fwasm-exceptions -mllvm -wasm-use-legacy-eh=false)
Expand Down
Loading