Skip to content

Commit 78bd130

Browse files
shravanrnshravanrn
committed
Misc Cmake cleanup
1 parent 3f87e29 commit 78bd130

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

‎CMakeLists.txt‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,20 @@ list(APPEND CMAKE_MODULE_PATH "${catch2_SOURCE_DIR}/contrib")
9898
if (WIN32)
9999
FetchContent_Declare(
100100
wasiclang
101-
URL
102-
https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-mingw.tar.gz
101+
URL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-mingw.tar.gz
102+
DOWNLOAD_EXTRACT_TIMESTAMP false
103103
)
104104
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
105105
FetchContent_Declare(
106106
wasiclang
107-
URL
108-
https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-macos.tar.gz
107+
URL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-macos.tar.gz
108+
DOWNLOAD_EXTRACT_TIMESTAMP false
109109
)
110110
else()
111111
FetchContent_Declare(
112112
wasiclang
113-
URL
114-
https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz
113+
URL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz
114+
DOWNLOAD_EXTRACT_TIMESTAMP false
115115
)
116116
endif()
117117
FetchContent_GetProperties(wasiclang)
@@ -120,15 +120,15 @@ if(NOT wasiclang_POPULATED)
120120
endif()
121121

122122
FetchContent_Declare(
123-
mod_wasm2c
123+
wasm2c_compiler
124124
GIT_REPOSITORY https://github.com/WebAssembly/wabt/
125125
GIT_TAG 40be47dbfceea07951325dd2197a96c74d8c77a8)
126-
FetchContent_GetProperties(mod_wasm2c)
127-
if(NOT mod_wasm2c_POPULATED)
128-
FetchContent_Populate(mod_wasm2c)
126+
FetchContent_GetProperties(wasm2c_compiler)
127+
if(NOT wasm2c_compiler_POPULATED)
128+
FetchContent_Populate(wasm2c_compiler)
129129
endif()
130130

131-
# set (mod_wasm2c_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../wabt/")
131+
# set (wasm2c_compiler_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../wabt/")
132132

133133
if(DEV)
134134
if(MSVC)
@@ -164,8 +164,8 @@ endif()
164164

165165
# wasm2c ###################
166166

167-
set(WASM2C_RUNTIME_SOURCE_DIR "${mod_wasm2c_SOURCE_DIR}/wasm2c/")
168-
set(WASM2C_RUNTIME_DIR "${mod_wasm2c_SOURCE_DIR}/build_${WASM2C_BUILD_DIR_SUFFIX}/")
167+
set(WASM2C_RUNTIME_SOURCE_DIR "${wasm2c_compiler_SOURCE_DIR}/wasm2c/")
168+
set(WASM2C_RUNTIME_DIR "${wasm2c_compiler_SOURCE_DIR}/build_${WASM2C_BUILD_DIR_SUFFIX}/")
169169

170170
set(C_SOURCE_FILES "${CMAKE_SOURCE_DIR}/c_src/wasm2c_sandbox_wrapper.c")
171171
set(GLUE_LIB_WASM_IMPORTED_DIR "${CMAKE_BINARY_DIR}/wasm_imported/")
@@ -184,7 +184,7 @@ else()
184184
endif()
185185

186186
add_custom_command(OUTPUT "${WASM2C_PATH}"
187-
WORKING_DIRECTORY "${mod_wasm2c_SOURCE_DIR}"
187+
WORKING_DIRECTORY "${wasm2c_compiler_SOURCE_DIR}"
188188
COMMAND ${CMAKE_COMMAND}
189189
-DCMAKE_BUILD_TYPE=${WASM2C_BUILD_TYPE}
190190
-DCMAKE_C_FLAGS="${RLBOX_SANITIZER_COMPILE_FLAGS}"
@@ -245,17 +245,17 @@ set(WASM2C_RUNTIME_CODE ${WASM2C_RUNTIME_SOURCE_DIR}/wasm-rt-impl.c
245245
${CMAKE_SOURCE_DIR}/src/wasm2c_rt_mem.c)
246246

247247
add_library(glue_lib_imported STATIC ${GLUE_LIB_IMPORTED_C} ${WASM2C_RUNTIME_CODE})
248-
target_include_directories(glue_lib_imported PRIVATE ${mod_wasm2c_SOURCE_DIR}/wasm2c
249-
PUBLIC ${mod_wasm2c_SOURCE_DIR}/third_party/simde
248+
target_include_directories(glue_lib_imported PRIVATE ${wasm2c_compiler_SOURCE_DIR}/wasm2c
249+
PUBLIC ${wasm2c_compiler_SOURCE_DIR}/third_party/simde
250250
PRIVATE ${CMAKE_SOURCE_DIR}/include)
251251

252252
target_compile_definitions(glue_lib_imported PUBLIC WASM_RT_USE_MMAP=1
253253
PUBLIC WASM_RT_SKIP_SIGNAL_RECOVERY=1
254254
PUBLIC WASM_RT_NONCONFORMING_UNCHECKED_STACK_EXHAUSTION=1)
255255

256256
add_library(glue_lib_exported STATIC ${GLUE_LIB_EXPORTED_C} ${WASM2C_RUNTIME_CODE})
257-
target_include_directories(glue_lib_exported PRIVATE ${mod_wasm2c_SOURCE_DIR}/wasm2c
258-
PUBLIC ${mod_wasm2c_SOURCE_DIR}/third_party/simde
257+
target_include_directories(glue_lib_exported PRIVATE ${wasm2c_compiler_SOURCE_DIR}/wasm2c
258+
PUBLIC ${wasm2c_compiler_SOURCE_DIR}/third_party/simde
259259
PRIVATE ${CMAKE_SOURCE_DIR}/include)
260260

261261
target_compile_definitions(glue_lib_exported PUBLIC WASM_RT_USE_MMAP=1
@@ -278,7 +278,7 @@ target_include_directories(test_rlbox_glue PUBLIC ${CMAKE_SOURCE_DIR}/include
278278
PUBLIC ${rlbox_SOURCE_DIR}/code/include
279279
PUBLIC ${rlbox_SOURCE_DIR}/code/tests/rlbox_glue
280280
PUBLIC ${rlbox_SOURCE_DIR}/code/tests/rlbox_glue/lib
281-
PUBLIC ${mod_wasm2c_SOURCE_DIR}/wasm2c
281+
PUBLIC ${wasm2c_compiler_SOURCE_DIR}/wasm2c
282282
PUBLIC ${GLUE_LIB_WASM_IMPORTED_DIR}
283283
)
284284
target_link_libraries(test_rlbox_glue Catch2::Catch2
@@ -300,7 +300,7 @@ target_include_directories(test_rlbox_glue_exported PUBLIC ${CMAKE_SOURCE_DIR}/i
300300
PUBLIC ${rlbox_SOURCE_DIR}/code/include
301301
PUBLIC ${rlbox_SOURCE_DIR}/code/tests/rlbox_glue
302302
PUBLIC ${rlbox_SOURCE_DIR}/code/tests/rlbox_glue/lib
303-
PUBLIC ${mod_wasm2c_SOURCE_DIR}/wasm2c
303+
PUBLIC ${wasm2c_compiler_SOURCE_DIR}/wasm2c
304304
PUBLIC ${GLUE_LIB_WASM_EXPORTED_DIR}
305305
)
306306
target_link_libraries(test_rlbox_glue_exported Catch2::Catch2
@@ -322,7 +322,7 @@ target_include_directories(test_rlbox_glue_smallheap PUBLIC ${CMAKE_SOURCE_DIR}/
322322
PUBLIC ${rlbox_SOURCE_DIR}/code/include
323323
PUBLIC ${rlbox_SOURCE_DIR}/code/tests/rlbox_glue
324324
PUBLIC ${rlbox_SOURCE_DIR}/code/tests/rlbox_glue/lib
325-
PUBLIC ${mod_wasm2c_SOURCE_DIR}/wasm2c
325+
PUBLIC ${wasm2c_compiler_SOURCE_DIR}/wasm2c
326326
PUBLIC ${GLUE_LIB_WASM_IMPORTED_DIR}
327327
)
328328
target_link_libraries(test_rlbox_glue_smallheap Catch2::Catch2
@@ -344,7 +344,7 @@ target_include_directories(test_rlbox_glue_embed PUBLIC ${CMAKE_SOURCE_DIR}/incl
344344
PUBLIC ${rlbox_SOURCE_DIR}/code/include
345345
PUBLIC ${rlbox_SOURCE_DIR}/code/tests/rlbox_glue
346346
PUBLIC ${rlbox_SOURCE_DIR}/code/tests/rlbox_glue/lib
347-
PUBLIC ${mod_wasm2c_SOURCE_DIR}/wasm2c
347+
PUBLIC ${wasm2c_compiler_SOURCE_DIR}/wasm2c
348348
PUBLIC ${GLUE_LIB_WASM_IMPORTED_DIR}
349349
)
350350
target_link_libraries(test_rlbox_glue_embed Catch2::Catch2

0 commit comments

Comments
 (0)