From 2874a3d2cab9f46aa1dd9e4fbb1092f5029e7012 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Thu, 25 Jan 2018 23:39:32 +0100 Subject: [PATCH] fix android build (skip auto-complete when BUILD_TOOLS is FALSE) --- interface/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 96d04c784d..d0d89919d5 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -276,8 +276,10 @@ endif() # assume we are using a Qt build without bearer management add_definitions(-DQT_NO_BEARERMANAGEMENT) -# require JSDoc to be build before interface is deployed (Console Auto-complete) -add_dependencies(${TARGET_NAME} jsdoc) +if (BUILD_TOOLS) + # require JSDoc to be build before interface is deployed (Console Auto-complete) + add_dependencies(${TARGET_NAME} jsdoc) +endif() if (APPLE) # link in required OS X frameworks and include the right GL headers @@ -294,7 +296,7 @@ if (APPLE) set(SCRIPTS_INSTALL_DIR "${INTERFACE_INSTALL_APP_PATH}/Contents/Resources") - if (NPM_EXECUTABLE) + if (BUILD_TOOLS AND NPM_EXECUTABLE) set(EXTRA_COPY_COMMANDS COMMAND "${CMAKE_COMMAND}" -E make_directory "$/../Resources/auto-complete" @@ -317,7 +319,7 @@ if (APPLE) fixup_interface() else() - if (NPM_EXECUTABLE) + if (BUILD_TOOLS AND NPM_EXECUTABLE) set(EXTRA_COPY_COMMANDS COMMAND "${CMAKE_COMMAND}" -E make_directory "$/resources/auto-complete"