From 5e762a4b95dbf3d337f6f4f5a3b52f73802e07e9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 4 Jan 2016 16:29:00 -0800
Subject: [PATCH] specify console folder to copy per-platform

---
 cmake/macros/ConsolidateInstallerComponents.cmake | 4 ++--
 console/CMakeLists.txt                            | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/cmake/macros/ConsolidateInstallerComponents.cmake b/cmake/macros/ConsolidateInstallerComponents.cmake
index af97c1ae2d..36389126cc 100644
--- a/cmake/macros/ConsolidateInstallerComponents.cmake
+++ b/cmake/macros/ConsolidateInstallerComponents.cmake
@@ -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
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index ebb8ac2f0a..4f457b3712 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -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()