Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-10 08:57:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix android build (skip auto-complete when BUILD_TOOLS is FALSE)

Browse source
This commit is contained in:
Thijs Wenker 2018-01-25 23:39:32 +01:00
parent 45487a1e45
commit 2874a3d2ca
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/CMakeLists.txt
View file

@ -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
"$<TARGET_FILE_DIR:${TARGET_NAME}>/../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
"$<TARGET_FILE_DIR:${TARGET_NAME}>/resources/auto-complete"