diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index 9c8f6bdb78..0c54ad71ac 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -9,7 +9,12 @@ link_hifi_libraries(
   controllers physics
 )
 
-set(MANUAL_SSLEAY_COPY TRUE)
-package_libraries_for_deployment()
+if (WIN32)
+  # we need SSL_EAY_LIBRARY_* to be set before we call package_libraries_for_deployment()
+  # so we have to call find_package(OpenSSL) here even though this target doesn't specifically need it
+  find_package(OpenSSL REQUIRED)
+  set(MANUAL_SSLEAY_COPY TRUE)
+  package_libraries_for_deployment()
+endif()
 
 install_beside_console()
diff --git a/cmake/templates/FixupBundlePostBuild.cmake.in b/cmake/templates/FixupBundlePostBuild.cmake.in
index 75513a033f..3eeeb8082d 100644
--- a/cmake/templates/FixupBundlePostBuild.cmake.in
+++ b/cmake/templates/FixupBundlePostBuild.cmake.in
@@ -52,9 +52,9 @@ endif()
 
 file(GLOB EXTRA_LIBRARIES "${BUNDLE_PLUGIN_DIR}/*.${PLUGIN_EXTENSION}")
 
-if (MANUAL_SSLEAY_COPY)
-  message(STATUS "Adding $<$<CONFIG:Debug>:"@SSL_EAY_LIBRARY_DEBUG@"> $<$<NOT:$<CONFIG:Debug>>:"@SSL_EAY_LIBRARY_RELEASE@"> to fixed up libraries")
-  list(APPEND EXTRA_LIBRARIES $<$<CONFIG:Debug>:${SSL_EAY_LIBRARY_DEBUG}> $<$<NOT:$<CONFIG:Debug>>:${SSL_EAY_LIBRARY_RELEASE}>)
+if (@MANUAL_SSLEAY_COPY@)
+  message(STATUS "Adding $<$<CONFIG:Debug>:@SSL_EAY_LIBRARY_DEBUG@> $<$<NOT:$<CONFIG:Debug>>:@SSL_EAY_LIBRARY_RELEASE@> to fixed up libraries")
+  list(APPEND EXTRA_LIBRARIES "$<$<CONFIG:Debug>:@SSL_EAY_LIBRARY_DEBUG@>" "$<$<NOT:$<CONFIG:Debug>>:@SSL_EAY_LIBRARY_RELEASE@>")
 endif()
 
 fixup_bundle("${BUNDLE_EXECUTABLE}" "${EXTRA_LIBRARIES}" "@FIXUP_LIBS@")
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index cbea7ef34c..08bd39190a 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -34,9 +34,11 @@ target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES})
 # libcrypto uses dlopen in libdl
 if (UNIX)
   target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
-endif (UNIX)
+endif ()
 
-set(MANUAL_SSLEAY_COPY TRUE)
-package_libraries_for_deployment()
+if (WIN32)
+  set(MANUAL_SSLEAY_COPY TRUE)
+  package_libraries_for_deployment()
+endif ()
 
 install_beside_console()
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index fc6bf77033..482adea848 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -263,7 +263,10 @@ fixup_interface()
 
 if (WIN32)
     set(EXTRA_DEPLOY_OPTIONS "--qmldir  ${PROJECT_SOURCE_DIR}/resources/qml")
-endif()
 
-set(MANUAL_SSLEAY_COPY TRUE)
-package_libraries_for_deployment()
+    # we need SSL_EAY_LIBRARY_* to be set before we call package_libraries_for_deployment()
+    # so we have to call find_package(OpenSSL) here even though this target doesn't specifically need it
+    find_package(OpenSSL REQUIRED)
+    set(MANUAL_SSLEAY_COPY TRUE)
+    package_libraries_for_deployment()
+endif()