diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index 58f200b0fe..3064e97d70 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -11,3 +11,4 @@ link_hifi_libraries(
 
 include_application_version()
 package_libraries_for_deployment()
+consolidate_stack_components()
\ No newline at end of file
diff --git a/cmake/macros/ConsolidateStackComponents.cmake b/cmake/macros/ConsolidateStackComponents.cmake
new file mode 100644
index 0000000000..2b2fe9a691
--- /dev/null
+++ b/cmake/macros/ConsolidateStackComponents.cmake
@@ -0,0 +1,9 @@
+macro(CONSOLIDATE_STACK_COMPONENTS)
+
+  # Copy all the output for this target into the common deployment location
+  add_custom_command(
+  	TARGET ${TARGET_NAME} POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/full-stack-deployment
+  )
+
+endmacro()
\ No newline at end of file
diff --git a/cmake/macros/CopyDllsBesideWindowsExecutable.cmake b/cmake/macros/PackageLibrariesForDeployment.cmake
similarity index 98%
rename from cmake/macros/CopyDllsBesideWindowsExecutable.cmake
rename to cmake/macros/PackageLibrariesForDeployment.cmake
index 9330515a62..bb0b268dd4 100644
--- a/cmake/macros/CopyDllsBesideWindowsExecutable.cmake
+++ b/cmake/macros/PackageLibrariesForDeployment.cmake
@@ -1,5 +1,5 @@
 # 
-#  CopyDllsBesideWindowsExecutable.cmake
+#  PackageLibrariesForDeployment.cmake
 #  cmake/macros
 # 
 #  Copyright 2015 High Fidelity, Inc.
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 1f9280a899..2200916765 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -38,3 +38,4 @@ endif (UNIX)
 
 include_application_version()
 package_libraries_for_deployment()
+consolidate_stack_components()
\ No newline at end of file
diff --git a/stack-manager/CMakeLists.txt b/stack-manager/CMakeLists.txt
index e70fefc6e0..35b4f091a7 100644
--- a/stack-manager/CMakeLists.txt
+++ b/stack-manager/CMakeLists.txt
@@ -1,16 +1,19 @@
 set(TARGET_NAME "stack-manager")
 set(BUILD_BUNDLE YES)
 setup_hifi_project(Widgets Gui Svg Core Network WebKitWidgets)
+add_dependencies(${TARGET_NAME} assignment-client domain-server)
 
 if (WIN32)
   target_zlib()
 endif ()
 target_quazip()
 
-set_target_properties(
-  ${TARGET_NAME} PROPERTIES
-  EXCLUDE_FROM_ALL TRUE
-)
+if (UNIX)
+  set_target_properties(
+    ${TARGET_NAME} PROPERTIES
+    EXCLUDE_FROM_ALL TRUE
+  )
+endif (UNIX)
 
 if (DEFINED ENV{JOB_ID})
   set(PR_BUILD "false")
@@ -45,4 +48,5 @@ if (APPLE)
   set(SM_SRCS ${SM_SRCS} "${CMAKE_CURRENT_SOURCE_DIR}/assets/icon.icns")
 endif ()
 
-package_libraries_for_deployment()
\ No newline at end of file
+package_libraries_for_deployment()
+consolidate_stack_components()
\ No newline at end of file