diff --git a/.github/workflows/ResInsightWithCache.yml b/.github/workflows/ResInsightWithCache.yml index a4887c0072..1205873f33 100644 --- a/.github/workflows/ResInsightWithCache.yml +++ b/.github/workflows/ResInsightWithCache.yml @@ -163,6 +163,7 @@ jobs: -D CMAKE_INSTALL_PREFIX=cmakebuild/install -D GSL_ENABLE=true -D RESINSIGHT_ENABLE_UNITY_BUILD=true + -D RESINSIGHT_BUNDLE_OPENSSL=true -D RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS=true -D RESINSIGHT_TREAT_WARNINGS_AS_ERRORS=true -D RESINSIGHT_ENABLE_GRPC=true diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index d6d655e286..28177014f1 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -679,7 +679,7 @@ if (RESINSIGHT_PRIVATE_INSTALL) # install GRPC-related DLLs if (RESINSIGHT_ENABLE_GRPC) - set (GRPC_DLL_NAMES libprotobuf cares zlib1) + set (GRPC_DLL_NAMES libprotobuf cares zlib1 abseil_dll) foreach (dllname ${GRPC_DLL_NAMES}) list(APPEND RESINSIGHT_FILES $/${dllname}.dll) endforeach(dllname ${GRPC_DLL_NAMES}) @@ -697,8 +697,8 @@ if (RESINSIGHT_PRIVATE_INSTALL) string(REPLACE "include" "bin" OPENSSL_BIN_DIR ${OPENSSL_BIN_DIR}) message("OpenSSL binary dir: ${OPENSSL_BIN_DIR}") - install(FILES ${OPENSSL_BIN_DIR}/libeay32.dll DESTINATION ${RESINSIGHT_INSTALL_FOLDER}) - install(FILES ${OPENSSL_BIN_DIR}/ssleay32.dll DESTINATION ${RESINSIGHT_INSTALL_FOLDER}) + install(FILES ${OPENSSL_BIN_DIR}/libcrypto-1_1-x64.dll DESTINATION ${RESINSIGHT_INSTALL_FOLDER}) + install(FILES ${OPENSSL_BIN_DIR}/libssl-1_1-x64.dll DESTINATION ${RESINSIGHT_INSTALL_FOLDER}) endif(OPENSSL_FOUND) endif(RESINSIGHT_BUNDLE_OPENSSL)