OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2024-12-28 01:41:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Additional Openssl adjustments

Browse Source
This commit is contained in:
Magne Sjaastad 2024-10-04 15:28:42 +02:00 committed by GitHub
parent d01ef325fa
commit b9448c2430
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationExeCode/CMakeLists.txt
View File

@ -496,6 +496,23 @@ else(RESINSIGHT_PRIVATE_INSTALL)
) )
endif(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 # Installation packaging
# ############################################################################## # ##############################################################################

2
CMakeLists.txt
View File

@ -1066,7 +1066,7 @@ else(RESINSIGHT_USE_EXTERNAL_OCTAVE_PLUGINS)
if(OCTAVE_MKOCTFILE) if(OCTAVE_MKOCTFILE)
message(STATUS "Adding OctavePlugin library") message(STATUS "Adding OctavePlugin library")
add_subdirectory(Octave/OctavePlugin) # add_subdirectory(Octave/OctavePlugin)
else(OCTAVE_MKOCTFILE) else(OCTAVE_MKOCTFILE)
message( message(
STATUS "Could not find OCTAVE_MKOCTFILE, skipping OctavePlugin library" STATUS "Could not find OCTAVE_MKOCTFILE, skipping OctavePlugin library"

2
scripts/additional-packages/readme.md
View File

@ -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 1. Build and install ResInsight
2. Build a dynamic version of OpenSSL 3 using vcpkg. In the /build folder, execute the following: 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` 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 3. Copy `libcrypto.so/libssl.so` to the `/lib64` folder in the install package for ResInsight