diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 8067e800a5..b0b4ae0c5c 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -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()