diff --git a/cmake/macros/ConsolidateStackComponents.cmake b/cmake/macros/ConsolidateStackComponents.cmake
index 50a1f5e48a..2a991e5d03 100644
--- a/cmake/macros/ConsolidateStackComponents.cmake
+++ b/cmake/macros/ConsolidateStackComponents.cmake
@@ -1,6 +1,6 @@
 macro(CONSOLIDATE_STACK_COMPONENTS)
 
-  if (DEFINED ENV{ghprbPullId})
+  if (DEFINED ENV{ghprbPullId} AND WIN32)
   # Copy all the output for this target into the common deployment location
   add_custom_command(
   	TARGET ${TARGET_NAME} POST_BUILD
diff --git a/cmake/modules/FindOpenSSL.cmake b/cmake/modules/FindOpenSSL.cmake
index 2142322687..2a15cf7929 100644
--- a/cmake/modules/FindOpenSSL.cmake
+++ b/cmake/modules/FindOpenSSL.cmake
@@ -107,7 +107,7 @@ if (WIN32 AND NOT CYGWIN)
     select_library_configurations(SSL_EAY)
 
     set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY})
-    
+
     find_path(OPENSSL_DLL_PATH NAMES ssleay32.dll PATH_SUFFIXES "bin" ${_OPENSSL_ROOT_HINTS_AND_PATHS})
     
   elseif (MINGW)
@@ -250,8 +250,18 @@ else ()
   )
 endif ()
 
+
+    message(STATUS "++++++++++++++++++++++++++++")
+    message(STATUS "${OPENSSL_LIBRARIES}")
+    message(STATUS "${OPENSSL_DLL_PATH}")
 if (WIN32)
   add_paths_to_fixup_libs(${OPENSSL_DLL_PATH})
+  if (DEFINED ENV{ghprbPullId})
+    add_custom_command(
+      TARGET ${TARGET_NAME} POST_BUILD
+      COMMAND "${CMAKE_COMMAND}" -E copy ${OPENSSL_DLL_PATH}/ssleay32.dll ${CMAKE_BINARY_DIR}/full-stack-deployment
+    )
+  endif ()
 endif ()
 
 mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES OPENSSL_SEARCH_DIRS)