diff --git a/examples/app/CMakeLists.txt b/examples/app/CMakeLists.txt index 1daff830..6513a360 100644 --- a/examples/app/CMakeLists.txt +++ b/examples/app/CMakeLists.txt @@ -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) diff --git a/examples/callgraph/CMakeLists.txt b/examples/callgraph/CMakeLists.txt index 882a1cd6..3a948ec1 100644 --- a/examples/callgraph/CMakeLists.txt +++ b/examples/callgraph/CMakeLists.txt @@ -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}) diff --git a/examples/fuzz/CMakeLists.txt b/examples/fuzz/CMakeLists.txt index 15b2d177..4f59f2d3 100644 --- a/examples/fuzz/CMakeLists.txt +++ b/examples/fuzz/CMakeLists.txt @@ -24,6 +24,6 @@ set(app_sources add_executable(fuzz-instantiate ${app_sources}) target_link_libraries(fuzz-instantiate - toywasm-lib-core - $<$:toywasm-lib-wasi> + toywasm::toywasm-lib-core + $<$:toywasm::toywasm-lib-wasi> m) diff --git a/examples/hostfunc/CMakeLists.txt b/examples/hostfunc/CMakeLists.txt index 1ab86121..bc69bb35 100644 --- a/examples/hostfunc/CMakeLists.txt +++ b/examples/hostfunc/CMakeLists.txt @@ -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") diff --git a/examples/log_execution/CMakeLists.txt b/examples/log_execution/CMakeLists.txt index 7a7ad1b0..384de161 100644 --- a/examples/log_execution/CMakeLists.txt +++ b/examples/log_execution/CMakeLists.txt @@ -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") diff --git a/examples/run/CMakeLists.txt b/examples/run/CMakeLists.txt index 2a32288f..515adc4c 100644 --- a/examples/run/CMakeLists.txt +++ b/examples/run/CMakeLists.txt @@ -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) diff --git a/examples/runwasi/CMakeLists.txt b/examples/runwasi/CMakeLists.txt index 0ae36616..a980ba02 100644 --- a/examples/runwasi/CMakeLists.txt +++ b/examples/runwasi/CMakeLists.txt @@ -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) diff --git a/examples/runwasi_cstruct/CMakeLists.txt b/examples/runwasi_cstruct/CMakeLists.txt index 3b7ad047..868060a1 100644 --- a/examples/runwasi_cstruct/CMakeLists.txt +++ b/examples/runwasi_cstruct/CMakeLists.txt @@ -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") diff --git a/examples/wasm2cstruct/CMakeLists.txt b/examples/wasm2cstruct/CMakeLists.txt index 67022464..213dc55d 100644 --- a/examples/wasm2cstruct/CMakeLists.txt +++ b/examples/wasm2cstruct/CMakeLists.txt @@ -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) diff --git a/examples/wasm2wasm/CMakeLists.txt b/examples/wasm2wasm/CMakeLists.txt index da5f5fbc..5a86fc17 100644 --- a/examples/wasm2wasm/CMakeLists.txt +++ b/examples/wasm2wasm/CMakeLists.txt @@ -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) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d490e421..e3a82396 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -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) - diff --git a/libdyld/CMakeLists.txt b/libdyld/CMakeLists.txt index 6982e6f4..de624a5a 100644 --- a/libdyld/CMakeLists.txt +++ b/libdyld/CMakeLists.txt @@ -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) diff --git a/libwasi/CMakeLists.txt b/libwasi/CMakeLists.txt index 205764d1..4dd98841 100644 --- a/libwasi/CMakeLists.txt +++ b/libwasi/CMakeLists.txt @@ -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) diff --git a/libwasi_littlefs/CMakeLists.txt b/libwasi_littlefs/CMakeLists.txt index 941e80e3..9e1a7f1b 100644 --- a/libwasi_littlefs/CMakeLists.txt +++ b/libwasi_littlefs/CMakeLists.txt @@ -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) diff --git a/libwasi_threads/CMakeLists.txt b/libwasi_threads/CMakeLists.txt index ff4c89f3..35ff29a1 100644 --- a/libwasi_threads/CMakeLists.txt +++ b/libwasi_threads/CMakeLists.txt @@ -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)