From c1a9a7f4c1e9dec157ceb2d067a6d0d7d80ccad7 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 Jan 2016 10:33:53 -0800
Subject: [PATCH] add ssleay copy for win AC/DS/Interface

---
 assignment-client/CMakeLists.txt              |  2 +
 cmake/templates/FixupBundlePostBuild.cmake.in | 63 ++++++++++---------
 domain-server/CMakeLists.txt                  |  1 +
 interface/CMakeLists.txt                      |  1 +
 4 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index 19f856c6eb..9c8f6bdb78 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -9,5 +9,7 @@ link_hifi_libraries(
   controllers physics
 )
 
+set(MANUAL_SSLEAY_COPY TRUE)
 package_libraries_for_deployment()
+
 install_beside_console()
diff --git a/cmake/templates/FixupBundlePostBuild.cmake.in b/cmake/templates/FixupBundlePostBuild.cmake.in
index 6e3ad9723b..3bdc025e11 100644
--- a/cmake/templates/FixupBundlePostBuild.cmake.in
+++ b/cmake/templates/FixupBundlePostBuild.cmake.in
@@ -1,56 +1,59 @@
-# 
+#
 #  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)
 
-
-# replace copy_resolved_item_into_bundle 
+# replace copy_resolved_item_into_bundle
 #
 # The official version of copy_resolved_item_into_bundle will print out a "warning:" when
 # the resolved item matches the resolved embedded item. This not not really an issue that
 # should rise to the level of a "warning" so we replace this message with a "status:"
 #
 function(copy_resolved_item_into_bundle resolved_item resolved_embedded_item)
-    if(WIN32)
-        # ignore case on Windows
-        string(TOLOWER "${resolved_item}" resolved_item_compare)
-        string(TOLOWER "${resolved_embedded_item}" resolved_embedded_item_compare)
-    else()
-        set(resolved_item_compare "${resolved_item}")
-        set(resolved_embedded_item_compare "${resolved_embedded_item}")
-    endif()
+  if (WIN32)
+    # ignore case on Windows
+    string(TOLOWER "${resolved_item}" resolved_item_compare)
+    string(TOLOWER "${resolved_embedded_item}" resolved_embedded_item_compare)
+  else()
+    set(resolved_item_compare "${resolved_item}")
+    set(resolved_embedded_item_compare "${resolved_embedded_item}")
+  endif()
 
-    if("${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}")
-        # this is our only change from the original version
-        message(STATUS "status: resolved_item == resolved_embedded_item - not copying...")
-    else()
-        #message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
-        execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${resolved_item}" "${resolved_embedded_item}")
-        if(UNIX AND NOT APPLE)
-            file(RPATH_REMOVE FILE "${resolved_embedded_item}")
-        endif()
+  if ("${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}")
+    # this is our only change from the original version
+    message(STATUS "status: resolved_item == resolved_embedded_item - not copying...")
+  else()
+    #message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${resolved_item}" "${resolved_embedded_item}")
+    if(UNIX AND NOT APPLE)
+        file(RPATH_REMOVE FILE "${resolved_embedded_item}")
     endif()
+  endif()
 endfunction()
 
 message(STATUS "FIXUP_LIBS for fixup_bundle called for bundle ${BUNDLE_EXECUTABLE} are @FIXUP_LIBS@")
-
 message(STATUS "Scanning for plugins from ${BUNDLE_PLUGIN_DIR}")
 
 if (APPLE)
-    set(PLUGIN_EXTENSION "dylib")
-elseif (WIN32) 
-    set(PLUGIN_EXTENSION "dll")
-else() 
-    set(PLUGIN_EXTENSION "so")
+  set(PLUGIN_EXTENSION "dylib")
+elseif (WIN32)
+  set(PLUGIN_EXTENSION "dll")
+else()
+  set(PLUGIN_EXTENSION "so")
 endif()
 
-file(GLOB RUNTIME_PLUGINS "${BUNDLE_PLUGIN_DIR}/*.${PLUGIN_EXTENSION}")
-fixup_bundle("${BUNDLE_EXECUTABLE}" "${RUNTIME_PLUGINS}" "@FIXUP_LIBS@")
+file(GLOB EXTRA_LIBRARIES "${BUNDLE_PLUGIN_DIR}/*.${PLUGIN_EXTENSION}")
+
+if (MANUAL_SSLEAY_COPY)
+  file(SET EXTRA_LIBRARIES ${EXTRA_LIBRARIES} "ssleay32.dll")
+endif()
+
+fixup_bundle("${BUNDLE_EXECUTABLE}" "${EXTRA_LIBRARIES}" "@FIXUP_LIBS@")
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 347757ae38..cbea7ef34c 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -36,6 +36,7 @@ if (UNIX)
   target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
 endif (UNIX)
 
+set(MANUAL_SSLEAY_COPY TRUE)
 package_libraries_for_deployment()
 
 install_beside_console()
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 23d9c9c7f8..fc6bf77033 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -265,4 +265,5 @@ if (WIN32)
     set(EXTRA_DEPLOY_OPTIONS "--qmldir  ${PROJECT_SOURCE_DIR}/resources/qml")
 endif()
 
+set(MANUAL_SSLEAY_COPY TRUE)
 package_libraries_for_deployment()