Skip to content

Commit

Permalink
Additional Openssl adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
magnesj authored Oct 4, 2024
1 parent d01ef32 commit b9448c2
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
17 changes: 17 additions & 0 deletions ApplicationExeCode/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ##############################################################################
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/additional-packages/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b9448c2

Please sign in to comment.