Skip to content

Commit f7141ff

Browse files
authored
Merge pull request #126 from NuiCpp/fix/better-parcel-target
Changed parcel target to custom command.
2 parents 873ad20 + 937a079 commit f7141ff

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

cmake/frontend/emscripten.cmake

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,33 @@ function(nui_prepare_emscripten_target)
4242
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
4343
)
4444

45-
add_custom_target(
46-
${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET}-parcel
45+
add_custom_command(
46+
OUTPUT "${CMAKE_BINARY_DIR}/bin/index.html"
4747
COMMAND ${CMAKE_COMMAND} -E copy_directory "${NUI_SOURCE_DIRECTORY}/nui/js" "${NUI_MODULE_BUILD_DIR}/nui-js"
48+
COMMAND ${CMAKE_COMMAND} -E rm -rf "${CMAKE_BINARY_DIR}/static"
4849
COMMAND ${CMAKE_COMMAND} -E copy_directory ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_STATIC} "${CMAKE_BINARY_DIR}/static"
4950
${INLINER_COMMAND}
5051
COMMAND "${CMAKE_BINARY_DIR}/node_modules/.bin/parcel" build --dist-dir "${CMAKE_BINARY_DIR}/bin" ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_PARCEL_ARGS}
5152
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
52-
BYPRODUCTS "${CMAKE_BINARY_DIR}/bin/index.html"
5353
DEPENDS "${CMAKE_BINARY_DIR}/bin/index.js"
5454
)
5555

56+
add_custom_target(
57+
${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET}-parcel
58+
DEPENDS "${CMAKE_BINARY_DIR}/bin/index.html"
59+
)
60+
5661
if (${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_UNPACKED_MODE})
5762
set(SINGLE_FILE_STRING "")
63+
64+
add_custom_command(
65+
OUTPUT "${CMAKE_BINARY_DIR}/../bin/index.wasm"
66+
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/bin/index.wasm" "${CMAKE_BINARY_DIR}/../bin/index.wasm"
67+
)
68+
5869
add_custom_target(
5970
${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET}-copy-wasm
60-
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/bin/index.wasm" "${CMAKE_BINARY_DIR}/../bin/index.wasm"
71+
DEPENDS "${CMAKE_BINARY_DIR}/../bin/index.wasm"
6172
)
6273
add_dependencies(${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET}-parcel ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET}-copy-wasm)
6374
else()

0 commit comments

Comments
 (0)