From b9448c24305762c3ec8fefb8a5d0b769b163e305 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 4 Oct 2024 15:28:42 +0200
Subject: [PATCH] Additional Openssl adjustments

---
 ApplicationExeCode/CMakeLists.txt     | 17 +++++++++++++++++
 CMakeLists.txt                        |  2 +-
 scripts/additional-packages/readme.md |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ApplicationExeCode/CMakeLists.txt b/ApplicationExeCode/CMakeLists.txt
index df72302909..0bb3c2991a 100644
--- a/ApplicationExeCode/CMakeLists.txt
+++ b/ApplicationExeCode/CMakeLists.txt
@@ -496,6 +496,23 @@ else(RESINSIGHT_PRIVATE_INSTALL)
   )
 endif(RESINSIGHT_PRIVATE_INSTALL)
 
+# ##############################################################################
+# Optional install of OpensSSL 3 for required platforms like RHEL8
+# ##############################################################################
+
+set(CUSTOM_OPENSSL_FILES libcrypto.so libcrypto.so.3 libssl.so libssl.so.3)
+foreach(file ${CUSTOM_OPENSSL_FILES})
+  if(EXISTS
+     "${CMAKE_BINARY_DIR}/vcpkg_installed_custom/x64-linux-dynamic/lib/${file}"
+  )
+    install(
+      FILES
+        ${CMAKE_BINARY_DIR}/vcpkg_installed_custom/x64-linux-dynamic/lib/${file}
+      DESTINATION lib64
+    )
+  endif()
+endforeach()
+
 # ##############################################################################
 # Installation packaging
 # ##############################################################################
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cfbdd7fa0..3eb05d323c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1066,7 +1066,7 @@ else(RESINSIGHT_USE_EXTERNAL_OCTAVE_PLUGINS)
   if(OCTAVE_MKOCTFILE)
     message(STATUS "Adding OctavePlugin library")
 
-    add_subdirectory(Octave/OctavePlugin)
+    # add_subdirectory(Octave/OctavePlugin)
   else(OCTAVE_MKOCTFILE)
     message(
       STATUS "Could not find OCTAVE_MKOCTFILE, skipping OctavePlugin library"
diff --git a/scripts/additional-packages/readme.md b/scripts/additional-packages/readme.md
index 02561a573a..6c96c37cd8 100644
--- a/scripts/additional-packages/readme.md
+++ b/scripts/additional-packages/readme.md
@@ -8,7 +8,7 @@ From Qt 6.5, OpenSSL 3 is used for authentication workflows. On RHEL8 the only a
 1. Build and install ResInsight
 2. Build a dynamic version of OpenSSL 3 using vcpkg. In the /build folder, execute the following:
 
-    ../ThirdParty/vcpkg/vcpkg install --triplet x64-linux-dynamic --x-manifest-root=../scripts/additional-packages --x-install-root=./vcpkg_installed
+    ../ThirdParty/vcpkg/vcpkg install --triplet x64-linux-dynamic --x-manifest-root=../scripts/additional-packages --x-install-root=./vcpkg_installed_custom
 
    Make sure that the libraries `libcrypto.so/libssl.so` are installed in `/build/vcpkg_installed/lib64`
 3. Copy `libcrypto.so/libssl.so` to the `/lib64` folder in the install package for ResInsight