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

specify console folder to copy per-platform

Browse source
This commit is contained in:
Stephen Birarda 2016-01-04 16:29:00 -08:00
parent ecbac3d8c7
commit 5e762a4b95
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/macros/ConsolidateInstallerComponents.cmake
View file

@ -11,7 +11,7 @@ macro(CONSOLIDATE_INSTALLER_COMPONENTS)
COMMAND "${CMAKE_COMMAND}" -E copy ${ICON_FILE_PATH} ${CMAKE_BINARY_DIR}/package-bundle/${ICON_DESTINATION_NAME}
COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/package-bundle
)
elseif (TARGET_NAME STREQUAL "package-console")
elseif (TARGET_NAME STREQUAL "package-console")
set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/resources/${CONSOLE_ICON}")
set (ICON_DESTINATION_NAME "console.ico")
@ -19,7 +19,7 @@ macro(CONSOLIDATE_INSTALLER_COMPONENTS)
add_custom_command(
TARGET ${TARGET_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy ${ICON_FILE_PATH} ${CMAKE_BINARY_DIR}/package-bundle/${ICON_DESTINATION_NAME}
COMMAND "${CMAKE_COMMAND}" -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/High\ Fidelity\ Console-* ${CMAKE_BINARY_DIR}/package-bundle
COMMAND "${CMAKE_COMMAND}" -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER} ${CMAKE_BINARY_DIR}/package-bundle
)
else ()
# add a command to copy the fixed up binary and libraries to package-bundle

9
console/CMakeLists.txt
View file

@ -6,6 +6,15 @@ add_custom_target(${TARGET_NAME}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
# set the packaged console folder depending on platform, so we can copy it
if (APPLE)
set(PACKAGED_CONSOLE_FOLDER "Server\\ Console-darwin-x64")
elseif (WIN32)
set(PACKAGED_CONSOLE_FOLDER "server-console-win32-x64")
elseif (UNIX)
set(PACKAGED_CONSOLE_FOLDER "server-console-linux-x64")
endif ()
set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE FOLDER "Installer")
consolidate_installer_components()