Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 21:23:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

exclude targets from all build, include app version

Browse source
This commit is contained in:
Stephen Birarda 2016-01-04 15:18:57 -08:00
parent fcc0c92ff1
commit 9e252f0b08
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/macros/GenerateInstallers.cmake
View file

@ -27,6 +27,6 @@ macro(GENERATE_INSTALLERS)
COMMAND CMD /C "\"${MAKENSIS_COMMAND}\" ${CMAKE_SOURCE_DIR}/tools/nsis/release.nsi"
)
set_target_properties(build-package PROPERTIES FOLDER "Installer")
set_target_properties(build-package PROPERTIES EXCLUDE_FROM_ALL TRUE FOLDER "Installer")
endif ()
endmacro()

6
cmake/macros/SetupHifiProject.cmake
View file

@ -15,9 +15,6 @@ macro(SETUP_HIFI_PROJECT)
file(GLOB SRC_SUBDIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*)
# inlcude the generated application version header
include_directories("${CMAKE_BINARY_DIR}/includes")
foreach(DIR ${SRC_SUBDIRS})
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/${DIR}")
file(GLOB DIR_CONTENTS "src/${DIR}/*")
@ -31,6 +28,9 @@ macro(SETUP_HIFI_PROJECT)
add_executable(${TARGET_NAME} ${TARGET_SRCS} ${AUTOMTC_SRC} ${AUTOSCRIBE_SHADER_LIB_SRC})
endif()
# include the generated application version header
target_include_directories(${TARGET_NAME} "${CMAKE_BINARY_DIR}/includes")
set(${TARGET_NAME}_DEPENDENCY_QT_MODULES ${ARGN})
list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core)

2
console/CMakeLists.txt
View file

@ -15,6 +15,6 @@ add_custom_target(${TARGET_NAME}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Installer")
set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE FOLDER "Installer")
consolidate_installer_components()