remove package bundle copying of ssleay dll

cmake/macros/OptionalWinExecutableSigning.cmake

@@ -20,9 +20,13 @@ macro(optional_win_executable_signing)
           message(FATAL_ERROR "Code signing of executables was requested but signtool.exe could not be found.")
         endif ()
 
+        if (NOT EXECUTABLE_NAME)
+          set(EXECUTABLE_NAME $<TARGET_FILE_NAME:${TARGET_NAME}>)
+        endif ()
+
         # setup the post install command to sign the executable
         set(SIGN_COMMAND "${SIGNTOOL_EXEC} sign /f $ENV{HF_PFX_FILE} /p $ENV{HF_PFX_PASSPHRASE} /tr http://tsa.starfieldtech.com\
-          /td SHA256 \${CMAKE_INSTALL_PREFIX}/$<TARGET_FILE_NAME:${TARGET_NAME}>"
+          /td SHA256 \${CMAKE_INSTALL_PREFIX}/${EXECUTABLE_NAME}"
         )
 
         install(CODE "execute_process(COMMAND ${SIGN_COMMAND})" COMPONENT ${EXECUTABLE_COMPONENT})

cmake/modules/FindOpenSSL.cmake

@@ -252,15 +252,6 @@ endif ()
 
 if (WIN32)
   add_paths_to_fixup_libs(${OPENSSL_DLL_PATH})
-  #
-  # For some reason fixup misses the following DLL and only copies libeay32. There's gotta be a better way to handle this
-  # but for now resorting to the following interm solution
-  if (DEFINED DEPLOY_PACKAGE AND DEPLOY_PACKAGE)
-    add_custom_command(
-      TARGET ${TARGET_NAME} POST_BUILD
-      COMMAND "${CMAKE_COMMAND}" -E copy ${OPENSSL_DLL_PATH}/ssleay32.dll ${CMAKE_BINARY_DIR}/package-bundle/
-    )
-  endif ()
 endif ()
 
 mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES OPENSSL_SEARCH_DIRS)

console/CMakeLists.txt

@@ -35,6 +35,10 @@ elseif (WIN32)
     DESTINATION ${CONSOLE_INSTALL_DIR}
     COMPONENT ${SERVER_COMPONENT}
   )
+
+  # sign the copied server console executable after install
+  set(EXECUTABLE_NAME ${CONSOLE_EXEC_NAME})
+  optional_win_executable_signing()
 endif()
 
 if (NOT PR_BUILD AND NOT PRODUCTION_BUILD)