From e421624e992a9fd97d4f0204799dc04b40b46d93 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 5 Jan 2016 13:34:00 -0800
Subject: [PATCH] put AC and DS binaries beside server-console

---
 assignment-client/CMakeLists.txt        |  2 ++
 cmake/macros/InstallBesideConsole.cmake | 21 +++++++++++++++++++++
 console/CMakeLists.txt                  |  1 +
 domain-server/CMakeLists.txt            |  2 ++
 4 files changed, 26 insertions(+)
 create mode 100644 cmake/macros/InstallBesideConsole.cmake

diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index a473a7427c..b2e890fe9e 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -9,5 +9,7 @@ link_hifi_libraries(
   controllers physics
 )
 
+install_beside_console()
+
 package_libraries_for_deployment()
 consolidate_installer_components()
diff --git a/cmake/macros/InstallBesideConsole.cmake b/cmake/macros/InstallBesideConsole.cmake
new file mode 100644
index 0000000000..08515feffb
--- /dev/null
+++ b/cmake/macros/InstallBesideConsole.cmake
@@ -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()
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index c59b0520be..df4d9b6610 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -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()
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 6bcda2de4a..9437656f9b 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -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()