diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index fe00d86c3a..ac9441319b 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -180,8 +180,9 @@ else () add_executable(${TARGET_NAME} ${INTERFACE_SRCS} ${QM}) endif () + if (BUILD_TOOLS AND NPM_EXECUTABLE) - # require JSDoc to be build before interface is deployed (Console Auto-complete) + # require JSDoc to be build before interface is deployed add_dependencies(resources jsdoc) endif() @@ -322,6 +323,13 @@ if (APPLE) "${RESOURCES_DEV_DIR}/scripts" ) + # copy JSDoc files beside the executable + add_custom_command(TARGET ${TARGET_NAME} POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy_directory + "${CMAKE_SOURCE_DIR}/tools/jsdoc/out" + "${RESOURCES_DEV_DIR}/jsdoc" + ) + # call the fixup_interface macro to add required bundling commands for installation fixup_interface() @@ -350,6 +358,13 @@ else() "${RESOURCES_DEV_DIR}/serverless/tutorial.json" ) + # copy JSDoc files beside the executable + add_custom_command(TARGET ${TARGET_NAME} POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy_directory + "${CMAKE_SOURCE_DIR}/tools/jsdoc/out" + "${INTERFACE_EXEC_DIR}/jsdoc" + ) + # link target to external libraries if (WIN32) target_link_libraries(${TARGET_NAME} wsock32.lib Winmm.lib) diff --git a/tools/jsdoc/CMakeLists.txt b/tools/jsdoc/CMakeLists.txt index 292523a813..4a6c18f243 100644 --- a/tools/jsdoc/CMakeLists.txt +++ b/tools/jsdoc/CMakeLists.txt @@ -13,5 +13,5 @@ file(TO_NATIVE_PATH ${JSDOC_WORKING_DIR} NATIVE_JSDOC_WORKING_DIR) add_custom_command(TARGET ${TARGET_NAME} COMMAND ${NPM_EXECUTABLE} --no-progress install && ${JSDOC_PATH} ${NATIVE_JSDOC_WORKING_DIR} -c ${JSDOC_CONFIG_PATH} -d ${OUTPUT_DIR} WORKING_DIRECTORY ${JSDOC_WORKING_DIR} - COMMENT "generate the JSDoc JSON for the JSConsole auto-completer" + COMMENT "generate the JSDoc JSON" )