Skip to content

Commit 6fca513

Browse files
authored
Simplify and fix cmake frontend build (arangodb#20451)
* Simplify and fix cmake frontend build The output dependency did not work as intended, because the existence of the build folder alone was already enough for make to conclude that there was nothing to do. * Fix
1 parent 73d4d5f commit 6fca513

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

cmake/frontend/aardvark.cmake

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,16 @@
55
find_package(Nodejs 16 REQUIRED)
66
find_package(Yarn REQUIRED)
77

8-
set(FRONTEND_DESTINATION ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/react/build)
8+
set(FRONTEND_DESTINATION ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/react)
99

1010
add_custom_target(frontend ALL
11-
DEPENDS ${FRONTEND_DESTINATION}
12-
)
13-
14-
add_custom_command(
1511
COMMENT "create frontend build"
16-
OUTPUT ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/react/build
17-
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/react
12+
WORKING_DIRECTORY ${FRONTEND_DESTINATION}
1813
COMMAND yarn install
1914
COMMAND yarn build
2015
)
2116

2217
add_custom_target(frontend_clean
23-
COMMAND ${CMAKE_COMMAND} -E remove_directory ${FRONTEND_DESTINATION}
18+
COMMAND ${CMAKE_COMMAND} -E remove_directory ${FRONTEND_DESTINATION}/build
2419
COMMENT "Removing frontend artefacts"
2520
)

0 commit comments

Comments
 (0)