Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 01:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix building interface without npm

Browse source
This commit is contained in:
Dale Glass 2021-07-11 19:26:34 +02:00
parent cf75200231
commit 276a0506bf
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
interface/CMakeLists.txt
View file

@ -19,8 +19,6 @@ endfunction()
set(CUSTOM_INTERFACE_QRC_PATHS "") set(CUSTOM_INTERFACE_QRC_PATHS "")
find_npm()
find_package( find_package(
Qt5 COMPONENTS Qt5 COMPONENTS
Gui Widgets Multimedia Network Qml Quick Script Svg Gui Widgets Multimedia Network Qml Quick Script Svg
@ -29,8 +27,8 @@ find_package(
) )
if (BUILD_TOOLS AND NPM_EXECUTABLE) if (BUILD_TOOLS AND JSDOC_ENABLED)
set(JSDOC_ENABLED 1) message(STATUS "JSDoc enabled, depending on jsdoc")
add_custom_qrc_path(CUSTOM_INTERFACE_QRC_PATHS "${CMAKE_BINARY_DIR}/tools/jsdoc/out/hifiJSDoc.json" "auto-complete/hifiJSDoc.json") add_custom_qrc_path(CUSTOM_INTERFACE_QRC_PATHS "${CMAKE_BINARY_DIR}/tools/jsdoc/out/hifiJSDoc.json" "auto-complete/hifiJSDoc.json")
endif () endif ()
@ -45,7 +43,7 @@ else ()
qt5_add_binary_resources(resources "${RESOURCES_QRC}" DESTINATION "${RESOURCES_RCC}") qt5_add_binary_resources(resources "${RESOURCES_QRC}" DESTINATION "${RESOURCES_RCC}")
endif() endif()
if (JSDOC_ENABLED) if (BUILD_TOOLS AND JSDOC_ENABLED)
add_dependencies(resources jsdoc) add_dependencies(resources jsdoc)
endif() endif()
@ -332,10 +330,6 @@ if (APPLE)
COMMAND "${CMAKE_COMMAND}" -E copy_directory COMMAND "${CMAKE_COMMAND}" -E copy_directory
"${CMAKE_SOURCE_DIR}/scripts" "${CMAKE_SOURCE_DIR}/scripts"
"${RESOURCES_DEV_DIR}/scripts" "${RESOURCES_DEV_DIR}/scripts"
# copy JSDoc files beside the executable
COMMAND "${CMAKE_COMMAND}" -E copy_directory
"${JSDOC_OUTPUT_PATH}"
"${RESOURCES_DEV_DIR}/jsdoc"
# copy the resources files beside the executable # copy the resources files beside the executable
COMMAND "${CMAKE_COMMAND}" -E copy_if_different COMMAND "${CMAKE_COMMAND}" -E copy_if_different
"${RESOURCES_RCC}" "${RESOURCES_RCC}"
@ -367,6 +361,13 @@ if (APPLE)
) )
endif() endif()
if (JSDOC_ENABLED)
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
# copy JSDoc files beside the executable
COMMAND "${CMAKE_COMMAND}" -E copy_directory
"${JSDOC_OUTPUT_PATH}"
"${RESOURCES_DEV_DIR}/jsdoc")
endif()
# call the fixup_interface macro to add required bundling commands for installation # call the fixup_interface macro to add required bundling commands for installation
fixup_interface() fixup_interface()
@ -393,11 +394,15 @@ else()
COMMAND "${CMAKE_COMMAND}" -E copy_if_different COMMAND "${CMAKE_COMMAND}" -E copy_if_different
"${PROJECT_SOURCE_DIR}/resources/serverless/redirect.json" "${PROJECT_SOURCE_DIR}/resources/serverless/redirect.json"
"${RESOURCES_DEV_DIR}/serverless/redirect.json" "${RESOURCES_DEV_DIR}/serverless/redirect.json"
)
if (JSDOC_ENABLED)
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
# copy JSDoc files beside the executable # copy JSDoc files beside the executable
COMMAND "${CMAKE_COMMAND}" -E copy_directory COMMAND "${CMAKE_COMMAND}" -E copy_directory
"${JSDOC_OUTPUT_PATH}" "${JSDOC_OUTPUT_PATH}"
"${INTERFACE_EXEC_DIR}/jsdoc" "${INTERFACE_EXEC_DIR}/jsdoc")
) endif()
# link target to external libraries # link target to external libraries
if (WIN32) if (WIN32)