Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-07 08:23:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix resources and jsdoc dependencies

Browse source
This commit is contained in:
Dale Glass 2021-07-03 18:26:56 +02:00
parent c95de72174
commit 6a62dc10e6
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/CMakeLists.txt
View file

@ -30,6 +30,7 @@ find_package(
if (BUILD_TOOLS AND NPM_EXECUTABLE)
set(JSDOC_ENABLED 1)
add_custom_qrc_path(CUSTOM_INTERFACE_QRC_PATHS "${CMAKE_BINARY_DIR}/tools/jsdoc/out/hifiJSDoc.json" "auto-complete/hifiJSDoc.json")
endif ()
@ -44,6 +45,10 @@ else ()
qt5_add_binary_resources(resources "${RESOURCES_QRC}" DESTINATION "${RESOURCES_RCC}")
endif()
if (JSDOC_ENABLED)
add_dependencies(resources jsdoc)
endif()
list(APPEND GENERATE_QRC_DEPENDS ${RESOURCES_RCC})
# set a default root dir for each of our optional externals if it was not passed
@ -187,7 +192,7 @@ if (BUILD_TOOLS AND NPM_EXECUTABLE)
add_dependencies(resources jsdoc)
endif()
if (WIN32 OR APPLE)
if (NOT ANDROID)
add_dependencies(${TARGET_NAME} resources)
endif()