Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Checkpoint towards integrated delivery

Browse source
This commit is contained in:
Leonardo Murillo 2015-11-24 16:12:04 -06:00
parent 28435b6d43
commit b7cdca75b7
5 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assignment-client/CMakeLists.txt
View file

@ -11,3 +11,4 @@ link_hifi_libraries(
include_application_version() include_application_version()
package_libraries_for_deployment() package_libraries_for_deployment()
consolidate_stack_components()

9
cmake/macros/ConsolidateStackComponents.cmake Normal file
View file

@ -0,0 +1,9 @@
macro(CONSOLIDATE_STACK_COMPONENTS)
# Copy all the output for this target into the common deployment location
add_custom_command(
TARGET ${TARGET_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/full-stack-deployment
)
endmacro()

2
cmake/macros/CopyDllsBesideWindowsExecutable.cmake → cmake/macros/PackageLibrariesForDeployment.cmake
View file

@ -1,5 +1,5 @@
# #
# CopyDllsBesideWindowsExecutable.cmake # PackageLibrariesForDeployment.cmake
# cmake/macros # cmake/macros
# #
# Copyright 2015 High Fidelity, Inc. # Copyright 2015 High Fidelity, Inc.

1
domain-server/CMakeLists.txt
View file

@ -38,3 +38,4 @@ endif (UNIX)
include_application_version() include_application_version()
package_libraries_for_deployment() package_libraries_for_deployment()
consolidate_stack_components()

14
stack-manager/CMakeLists.txt
View file

@ -1,16 +1,19 @@
set(TARGET_NAME "stack-manager") set(TARGET_NAME "stack-manager")
set(BUILD_BUNDLE YES) set(BUILD_BUNDLE YES)
setup_hifi_project(Widgets Gui Svg Core Network WebKitWidgets) setup_hifi_project(Widgets Gui Svg Core Network WebKitWidgets)
add_dependencies(${TARGET_NAME} assignment-client domain-server)
if (WIN32) if (WIN32)
target_zlib() target_zlib()
endif () endif ()
target_quazip() target_quazip()
set_target_properties( if (UNIX)
${TARGET_NAME} PROPERTIES set_target_properties(
EXCLUDE_FROM_ALL TRUE ${TARGET_NAME} PROPERTIES
) EXCLUDE_FROM_ALL TRUE
)
endif (UNIX)
if (DEFINED ENV{JOB_ID}) if (DEFINED ENV{JOB_ID})
set(PR_BUILD "false") set(PR_BUILD "false")
@ -45,4 +48,5 @@ if (APPLE)
set(SM_SRCS ${SM_SRCS} "${CMAKE_CURRENT_SOURCE_DIR}/assets/icon.icns") set(SM_SRCS ${SM_SRCS} "${CMAKE_CURRENT_SOURCE_DIR}/assets/icon.icns")
endif () endif ()
package_libraries_for_deployment() package_libraries_for_deployment()
consolidate_stack_components()