Skip to content

cmake namespace #306

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

cmake namespace #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5eb8b42
use cmake namespace
yamt Jun 5, 2025
e4044d6
adapt examples to use namespace
yamt Jun 5, 2025
1360004
fix a typo in the previous
yamt Jun 9, 2025
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 examples/app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ set(app_sources
)

add_executable(app ${app_sources})
target_link_libraries(app toywasm-lib-core m)
target_link_libraries(app toywasm::toywasm-lib-core m)
2 changes: 1 addition & 1 deletion examples/callgraph/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ set(app_sources
add_executable(callgraph ${app_sources})
target_include_directories(callgraph PRIVATE ${JANSSON_INCLUDE_DIRS})
target_link_directories(callgraph PRIVATE ${JANSSON_LIBRARY_DIRS})
target_link_libraries(callgraph toywasm-lib-core m ${JANSSON_LIBRARIES})
target_link_libraries(callgraph toywasm::toywasm-lib-core m ${JANSSON_LIBRARIES})
4 changes: 2 additions & 2 deletions examples/fuzz/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ set(app_sources

add_executable(fuzz-instantiate ${app_sources})
target_link_libraries(fuzz-instantiate
toywasm-lib-core
$<$<BOOL:${FUZZ_WASI}>:toywasm-lib-wasi>
toywasm::toywasm-lib-core
$<$<BOOL:${FUZZ_WASI}>:toywasm::toywasm-lib-wasi>
m)
2 changes: 1 addition & 1 deletion examples/hostfunc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ set(sources
)

add_executable(hostfunc ${sources})
target_link_libraries(hostfunc toywasm-lib-core toywasm-lib-wasi m)
target_link_libraries(hostfunc toywasm::toywasm-lib-core toywasm::toywasm-lib-wasi m)
target_include_directories(hostfunc PRIVATE "../runwasi")
2 changes: 1 addition & 1 deletion examples/log_execution/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ set(sources
)

add_executable(log-execution ${sources})
target_link_libraries(log-execution toywasm-lib-core toywasm-lib-wasi m)
target_link_libraries(log-execution toywasm::toywasm-lib-core toywasm::toywasm-lib-wasi m)
target_include_directories(log-execution PRIVATE "../runwasi")
2 changes: 1 addition & 1 deletion examples/run/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ set(sources
)

add_executable(run ${sources})
target_link_libraries(run toywasm-lib-core)
target_link_libraries(run toywasm::toywasm-lib-core)
2 changes: 1 addition & 1 deletion examples/runwasi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ set(sources
)

add_executable(runwasi ${sources})
target_link_libraries(runwasi toywasm-lib-core toywasm-lib-wasi m)
target_link_libraries(runwasi toywasm::toywasm-lib-core toywasm::toywasm-lib-wasi m)
2 changes: 1 addition & 1 deletion examples/runwasi_cstruct/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ set(sources
)

add_executable(runwasi_cstruct ${sources})
target_link_libraries(runwasi_cstruct toywasm-lib-core toywasm-lib-wasi m)
target_link_libraries(runwasi_cstruct toywasm::toywasm-lib-core toywasm::toywasm-lib-wasi m)
target_include_directories(runwasi_cstruct PRIVATE "../runwasi")
2 changes: 1 addition & 1 deletion examples/wasm2cstruct/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ set(app_sources
)

add_executable(wasm2cstruct ${app_sources})
target_link_libraries(wasm2cstruct toywasm-lib-core m)
target_link_libraries(wasm2cstruct toywasm::toywasm-lib-core m)
2 changes: 1 addition & 1 deletion examples/wasm2wasm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ set(app_sources
)

add_executable(wasm2wasm ${app_sources})
target_link_libraries(wasm2wasm toywasm-lib-core m)
target_link_libraries(wasm2wasm toywasm::toywasm-lib-core m)
2 changes: 1 addition & 1 deletion lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,5 +151,5 @@ install(TARGETS toywasm-lib-core
EXPORT toywasm-lib-core-config
PUBLIC_HEADER DESTINATION include/toywasm)
install(EXPORT toywasm-lib-core-config
NAMESPACE toywasm::
DESTINATION lib/cmake/toywasm-lib-core)

1 change: 1 addition & 0 deletions libdyld/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@ install(TARGETS toywasm-lib-dyld
EXPORT toywasm-lib-dyld-config
PUBLIC_HEADER DESTINATION include/toywasm)
install(EXPORT toywasm-lib-dyld-config
NAMESPACE toywasm::
DESTINATION lib/cmake/toywasm-lib-dyld)
1 change: 1 addition & 0 deletions libwasi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,5 @@ install(TARGETS toywasm-lib-wasi
EXPORT toywasm-lib-wasi-config
PUBLIC_HEADER DESTINATION include/toywasm)
install(EXPORT toywasm-lib-wasi-config
NAMESPACE toywasm::
DESTINATION lib/cmake/toywasm-lib-wasi)
1 change: 1 addition & 0 deletions libwasi_littlefs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,6 @@ install(TARGETS toywasm-lib-wasi-littlefs
EXPORT toywasm-lib-wasi-littlefs-config
PUBLIC_HEADER DESTINATION include/toywasm)
install(EXPORT toywasm-lib-wasi-littlefs-config
NAMESPACE toywasm::
DESTINATION lib/cmake/toywasm-lib-wasi-littlefs)
install(FILES ${TOYWASM_LITTLEFS_SOURCE_DIR}/LICENSE.md DESTINATION share/doc/toywasm/littlefs)
1 change: 1 addition & 0 deletions libwasi_threads/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ install(TARGETS toywasm-lib-wasi-threads
EXPORT toywasm-lib-wasi-threads-config
PUBLIC_HEADER DESTINATION include/toywasm)
install(EXPORT toywasm-lib-wasi-threads-config
NAMESPACE toywasm::
DESTINATION lib/cmake/toywasm-lib-wasi-threads)
Loading