Skip to content

Commit 48f1935

Browse files
committed
Reverted frontend copy change.
1 parent 8591625 commit 48f1935

1 file changed

Lines changed: 8 additions & 16 deletions

File tree

CMakeLists.txt

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,22 +86,6 @@ if (EMSCRIPTEN)
8686
add_subdirectory("${CMAKE_SOURCE_DIR}/nui-file-explorer/source/nui-file-explorer")
8787
add_subdirectory("${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components")
8888
add_subdirectory("${CMAKE_SOURCE_DIR}/frontend/source/frontend")
89-
90-
message(STATUS "Copy from ${CMAKE_CURRENT_BINARY_DIR}/bin to ${CMAKE_CURRENT_BINARY_DIR}/../frontend")
91-
add_custom_command(
92-
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../frontend/index.html" "${CMAKE_CURRENT_BINARY_DIR}/../frontend/index.js"
93-
# Delete previous output
94-
COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/../frontend"
95-
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/bin" "${CMAKE_CURRENT_BINARY_DIR}/../frontend"
96-
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/bin/index.html"
97-
)
98-
99-
add_custom_target(
100-
copy_web_files ALL
101-
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/../frontend/index.html" "${CMAKE_CURRENT_BINARY_DIR}/../frontend/index.js"
102-
COMMENT "Copying web files to frontend directory..."
103-
)
104-
add_dependencies(copy_web_files ${PROJECT_NAME})
10589
else()
10690
include("${CMAKE_CURRENT_LIST_DIR}/_cmake/resource_copy.cmake")
10791
include("${CMAKE_CURRENT_LIST_DIR}/_cmake/copy_styles_to_build_dir.cmake")
@@ -128,6 +112,14 @@ else()
128112
VERBATIM
129113
)
130114

115+
# Copy module bin to frontend.
116+
if (NOT OMIT_FRONTEND_BUILD)
117+
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
118+
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_BINARY_DIR}/module_${PROJECT_NAME}/bin" "$<TARGET_FILE_DIR:${PROJECT_NAME}>/../frontend"
119+
VERBATIM
120+
)
121+
endif()
122+
131123
if (NUI_SFTP_ENABLE_TESTING)
132124
include(./_cmake/dependencies/gtest.cmake)
133125
enable_testing()

0 commit comments

Comments
 (0)