put AC and DS binaries beside server-console

This commit is contained in:
Stephen Birarda 2016-01-05 13:34:00 -08:00
parent 39c3ae79f9
commit e421624e99
4 changed files with 26 additions and 0 deletions

View file

@ -9,5 +9,7 @@ link_hifi_libraries(
controllers physics
)
install_beside_console()
package_libraries_for_deployment()
consolidate_installer_components()

View file

@ -0,0 +1,21 @@
#
# InstallBesideConsole.cmake
# cmake/macros
#
# Copyright 2016 High Fidelity, Inc.
# Created by Stephen Birarda on January 5th, 2016
#
# Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
#
macro(install_beside_console)
# install this component beside the installed server-console executable
if (APPLE)
set(COMPONENT_DESTINATION "bin/Server Console.app/Contents/MacOS/")
else ()
set(COMPONENT_DESTINATION bin)
endif ()
install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION ${COMPONENT_DESTINATION} COMPONENT ${SERVER_COMPONENT})
endmacro()

View file

@ -22,6 +22,7 @@ elseif (UNIX)
set(PACKAGED_CONSOLE_FOLDER "server-console-linux-x64")
endif ()
# install the packaged Server Console
install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}/Server Console.app" DESTINATION bin COMPONENT ${SERVER_COMPONENT})
consolidate_installer_components()

View file

@ -36,5 +36,7 @@ if (UNIX)
target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
endif (UNIX)
install_beside_console()
package_libraries_for_deployment()
consolidate_installer_components()