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

install fixed up DS and AC beside console

Browse source
This commit is contained in:
Stephen Birarda 2016-01-07 18:03:14 -08:00
parent 5ccf59dae9
commit 1faa78fe72
5 changed files with 54 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/CMakeLists.txt
View file

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

11
cmake/macros/InstallBesideConsole.cmake
View file

@ -10,6 +10,7 @@
# #
macro(install_beside_console) macro(install_beside_console)
if (WIN32 OR APPLE)
# install this component beside the installed server-console executable # install this component beside the installed server-console executable
if (APPLE) if (APPLE)
set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents") set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents")
@ -18,11 +19,20 @@ macro(install_beside_console)
set(COMPONENT_DESTINATION ${CONSOLE_INSTALL_DIR}) set(COMPONENT_DESTINATION ${CONSOLE_INSTALL_DIR})
endif () endif ()
if (APPLE)
install( install(
TARGETS ${TARGET_NAME} TARGETS ${TARGET_NAME}
RUNTIME DESTINATION ${COMPONENT_DESTINATION} RUNTIME DESTINATION ${COMPONENT_DESTINATION}
COMPONENT ${SERVER_COMPONENT} COMPONENT ${SERVER_COMPONENT}
) )
else ()
# setup install of executable and things copied by fixup/windeployqt
install(
FILES $<TARGET_FILE_DIR:${TARGET_NAME}>
DESTINATION ${COMPONENT_DESTINATION}
COMPONENT ${SERVER_COMPONENT}
)
endif ()
if (TARGET_NAME STREQUAL domain-server) if (TARGET_NAME STREQUAL domain-server)
if (APPLE) if (APPLE)
@ -48,5 +58,6 @@ macro(install_beside_console)
fixup_bundle(\"${EXECUTABLE_NEEDING_FIXUP}\" \"\" \"${FIXUP_LIBS}\") fixup_bundle(\"${EXECUTABLE_NEEDING_FIXUP}\" \"\" \"${FIXUP_LIBS}\")
" COMPONENT ${SERVER_COMPONENT}) " COMPONENT ${SERVER_COMPONENT})
endif () endif ()
endif ()
endmacro() endmacro()

4
console/CMakeLists.txt
View file

@ -22,14 +22,14 @@ elseif (UNIX)
set(PACKAGED_CONSOLE_FOLDER "server-console-linux-x64") set(PACKAGED_CONSOLE_FOLDER "server-console-linux-x64")
endif () endif ()
# install the packaged Server Console # install the packaged Server Console in our install directory
if (APPLE) if (APPLE)
install( install(
PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}" PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}"
DESTINATION ${CONSOLE_INSTALL_DIR} DESTINATION ${CONSOLE_INSTALL_DIR}
COMPONENT ${SERVER_COMPONENT} COMPONENT ${SERVER_COMPONENT}
) )
else () elseif (WIN32)
install( install(
DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}/" DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}/"
DESTINATION ${CONSOLE_INSTALL_DIR} DESTINATION ${CONSOLE_INSTALL_DIR}

4
domain-server/CMakeLists.txt
View file

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

10
interface/CMakeLists.txt
View file

@ -225,12 +225,16 @@ else (APPLE)
$<TARGET_FILE_DIR:${TARGET_NAME}>/scripts $<TARGET_FILE_DIR:${TARGET_NAME}>/scripts
) )
# setup install of interface target
install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION . COMPONENT ${CLIENT_COMPONENT})
# link target to external libraries # link target to external libraries
if (WIN32) if (WIN32)
target_link_libraries(${TARGET_NAME} wsock32.lib Winmm.lib) target_link_libraries(${TARGET_NAME} wsock32.lib Winmm.lib)
# setup install of executable and things copied by fixup/windeployqt
install(
FILES $<TARGET_FILE_DIR:${TARGET_NAME}>
DESTINATION ${INTERFACE_INSTALL_DIR}
COMPONENT ${CLIENT_COMPONENT}
)
endif() endif()
endif (APPLE) endif (APPLE)