From bc899eaa581da85157ff1601c6499485fe52f653 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 17 Feb 2015 13:17:23 -0800
Subject: [PATCH] add fixup_bundle step for WIN32 interface

---
 CMakeLists.txt                                   |  5 +++--
 cmake/macros/AddDependencyExternalProjects.cmake |  2 +-
 cmake/scripts/FixupBundlePostBuild.cmake         | 13 +++++++++++++
 interface/CMakeLists.txt                         |  9 +++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 cmake/scripts/FixupBundlePostBuild.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10d7998454..6ebf5ea5e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,8 +103,9 @@ set(HIFI_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries")
 # setup for find modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
 
-set(MACRO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros")
-set(EXTERNAL_PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/externals")
+set(HIFI_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(MACRO_DIR "${HIFI_CMAKE_DIR}/macros")
+set(EXTERNAL_PROJECT_DIR "${HIFI_CMAKE_DIR}/externals")
 
 set(EXTERNALS_BINARY_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build-externals")
 if (ANDROID)
diff --git a/cmake/macros/AddDependencyExternalProjects.cmake b/cmake/macros/AddDependencyExternalProjects.cmake
index c039d09987..72dbad6639 100644
--- a/cmake/macros/AddDependencyExternalProjects.cmake
+++ b/cmake/macros/AddDependencyExternalProjects.cmake
@@ -1,5 +1,5 @@
 # 
-#  SetupExternalProject.cmake
+#  AddDependencyExternalProjects.cmake
 #  cmake/macros
 # 
 #  Copyright 2015 High Fidelity, Inc.
diff --git a/cmake/scripts/FixupBundlePostBuild.cmake b/cmake/scripts/FixupBundlePostBuild.cmake
new file mode 100644
index 0000000000..7a74089bfa
--- /dev/null
+++ b/cmake/scripts/FixupBundlePostBuild.cmake
@@ -0,0 +1,13 @@
+# 
+#  FixupBundlePostBuild.cmake.in
+#  cmake/templates
+# 
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Stephen Birarda on February 13, 2014
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+
+include(BundleUtilities)
+fixup_bundle("${BUNDLE_EXECUTABLE}" "" "")
\ No newline at end of file
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index c1e8b7d618..459a47a1ce 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -239,5 +239,14 @@ else (APPLE)
   endif()
 endif (APPLE)
 
+if (WIN32)
+  # add a post-build command to copy DLLs beside the interface executable
+  add_custom_command(
+    TARGET ${TARGET_NAME}
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -DBUNDLE_EXECUTABLE=$<TARGET_FILE:${TARGET_NAME}> -P ${HIFI_CMAKE_DIR}/scripts/FixupBundlePostBuild.cmake
+  )
+endif ()
+
 # link any dependencies bubbled up from our linked dependencies
 include_dependency_includes()