HPCC-21600 copy ssl lib for building espscm

fix xsd file name in copying new xsd files
fix unable install MSVC 14 redistribute runtime

CMakeLists.txt

@@ -204,7 +204,7 @@ if ( WIN32 )
     set ( CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE )
     include(InstallRequiredSystemLibraries)
     if (MSVC14)
-        find_file(MSVC14_REDIST "vcredist_${CMAKE_MSVC_ARCH}.exe" HINTS ${MSVC14_REDIST_DIR}/1033 )
+        find_file(MSVC14_REDIST "vcredist_${CMAKE_MSVC_ARCH}.exe" HINTS ${MSVC_REDIST_DIR}/1033 )
         if (EXISTS "${MSVC14_REDIST}")
             install ( PROGRAMS ${MSVC14_REDIST} DESTINATION tmp )
             get_filename_component(MSVC14_REDIST_NAME ${MSVC14_REDIST} NAME)

esp/scm/CMakeLists.txt

@@ -31,7 +31,12 @@ include ( ${CMAKE_CURRENT_SOURCE_DIR}/smcscm.cmake)
 include ( ${CMAKE_CURRENT_SOURCE_DIR}/additional.cmake)
 set (SCM_BUILD OFF)
 
+
 ADD_CUSTOM_TARGET( 
   espscm ALL
   DEPENDS ${ESP_GENERATED_INCLUDES}
 )
+
+if (WIN32)
+  ADD_DEPENDENCIES(espscm copy_libssl)
+endif()

initfiles/componentfiles/configschema/xsd/CMakeLists.txt

@@ -16,6 +16,7 @@
 
 FILE(GLOB xsdFiles "${CMAKE_CURRENT_SOURCE_DIR}/*xsd")
 FOREACH( xsdFile ${xsdFiles} )
-    configure_file(${xsdFile} ${CMAKE_CURRENT_BINARY_DIR}/${xsdFile})
-    Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${xsdFile} DESTINATION componentfiles/configschema/xsd COMPONENT Runtime)
+    get_filename_component( xsdFile2 "${xsdFile}" NAME )
+    configure_file(${xsdFile} ${CMAKE_CURRENT_BINARY_DIR}/${xsdFile2})
+    Install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${xsdFile2} DESTINATION componentfiles/configschema/xsd COMPONENT Runtime)
 ENDFOREACH ()

lib2/CMakeLists.txt

@@ -37,8 +37,10 @@ elseif (WIN32)
       find_file (ICU_DT_BIN "icudt57.dll" "${EXTERNALS_DIRECTORY}/icu/bin64" NO_DEFAULT_PATH)
       find_file (ICU_IN_BIN "icuin57.dll" "${EXTERNALS_DIRECTORY}/icu/bin64" NO_DEFAULT_PATH)
       find_file (ICU_UC_BIN "icuuc57.dll" "${EXTERNALS_DIRECTORY}/icu/bin64" NO_DEFAULT_PATH)
-      find_file (OPENSSL_LIB_BIN "libcrypto-1_1-x64.dll" "${EXTERNALS_DIRECTORY}/openssl/1.1/win64/lib" NO_DEFAULT_PATH)
-      find_file (OPENSSL_SSL_BIN "libssl-1_1-x64.dll" "${EXTERNALS_DIRECTORY}/openssl/1.1/win64/lib" NO_DEFAULT_PATH)
+      set (LIB_CRYPTO_DLL "libcrypto-1_1-x64.dll")
+      find_file (OPENSSL_LIB_BIN "${LIB_CRYPTO_DLL}" "${EXTERNALS_DIRECTORY}/openssl/1.1/win64/lib" NO_DEFAULT_PATH)
+      set (LIB_SSL_DLL "libssl-1_1-x64.dll")
+      find_file (OPENSSL_SSL_BIN "${LIB_SSL_DLL}" "${EXTERNALS_DIRECTORY}/openssl/1.1/win64/lib" NO_DEFAULT_PATH)
       find_file (XALAN_C_BIN "Xalan-C_1_11.dll" "${EXTERNALS_DIRECTORY}/xalan/xalan-c/win64/bin" NO_DEFAULT_PATH)
       find_file (XALAN_MESSAGES_BIN "XalanMessages_1_11.dll" "${EXTERNALS_DIRECTORY}/xalan/xalan-c/win64/bin" NO_DEFAULT_PATH)
       find_file (XERCES_C_BIN "xerces-c_3_1.dll" "${EXTERNALS_DIRECTORY}/xalan/xerces-c/win64/bin" NO_DEFAULT_PATH)
@@ -47,8 +49,10 @@ elseif (WIN32)
       find_file (ICU_DT_BIN "icudt57.dll" "${EXTERNALS_DIRECTORY}/icu/bin" NO_DEFAULT_PATH)
       find_file (ICU_IN_BIN "icuin57.dll" "${EXTERNALS_DIRECTORY}/icu/bin" NO_DEFAULT_PATH)
       find_file (ICU_UC_BIN "icuuc57.dll" "${EXTERNALS_DIRECTORY}/icu/bin" NO_DEFAULT_PATH)
-      find_file (OPENSSL_LIB_BIN "libcrypto-1_1.dll" "${EXTERNALS_DIRECTORY}/openssl/1.1/win32/lib" NO_DEFAULT_PATH)
-      find_file (OPENSSL_SSL_BIN "libssl-1_1.dll" "${EXTERNALS_DIRECTORY}/openssl/1.1/win32/lib" NO_DEFAULT_PATH)
+      set (LIB_CRYPTO_DLL "libcrypto-1_1.dll")
+      find_file (OPENSSL_LIB_BIN "${LIB_CRYPTO_DLL}" "${EXTERNALS_DIRECTORY}/openssl/1.1/win32/lib" NO_DEFAULT_PATH)
+      set (LIB_SSL_DLL "libssl-1_1.dll")
+      find_file (OPENSSL_SSL_BIN "${LIB_SSL_DLL}" "${EXTERNALS_DIRECTORY}/openssl/1.1/win32/lib" NO_DEFAULT_PATH)
       find_file (XALAN_C_BIN "Xalan-C_1_11.dll" "${EXTERNALS_DIRECTORY}/xalan/xalan-c/win32/bin" NO_DEFAULT_PATH)
       find_file (XALAN_MESSAGES_BIN "XalanMessages_1_11.dll" "${EXTERNALS_DIRECTORY}/xalan/xalan-c/win32/bin" NO_DEFAULT_PATH)
       find_file (XERCES_C_BIN "xerces-c_3_1.dll" "${EXTERNALS_DIRECTORY}/xalan/xerces-c/win32/bin" NO_DEFAULT_PATH)
@@ -66,6 +70,18 @@ elseif (WIN32)
     list(APPEND DYLIBS ${ZLIB_BIN})
 endif()
 
+if (WIN32)
+
+   set (LIB_CRYPTO_BIN   "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}/${LIB_CRYPTO_DLL}")
+   set (LIB_SSL_BIN   "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}/${LIB_SSL_DLL}")
+   ADD_CUSTOM_COMMAND(
+       COMMAND ${CMAKE_COMMAND} -E copy  ${OPENSSL_LIB_BIN} ${LIB_CRYPTO_BIN}
+       COMMAND ${CMAKE_COMMAND} -E copy  ${OPENSSL_SSL_BIN} ${LIB_SSL_BIN}
+       OUTPUT  ${LIB_CRYPTO_BIN} ${LIB_SSL_BIN}
+   )
+   ADD_CUSTOM_TARGET(copy_libssl ALL DEPENDS ${LIB_CRYPTO_BIN} ${LIB_SSL_BIN})
+endif ()
+
 foreach(dylib ${DYLIBS})
     get_filename_component(dylib_path ${dylib} REALPATH)
     if (WIN32)