Merge pull request #10940 from OPM/dev

2023.12: Update main branch from dev

.github/workflows/ResInsightWithCache.yml

@@ -129,7 +129,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.BUILDCACHE_DIR }}
-          key: ${{ matrix.config.os }}-${{ matrix.config.cc }}-cache-v02-${{ steps.current-time.outputs.formattedTime }}
+          key: ${{ matrix.config.os }}-${{ matrix.config.cc }}-cache-v03-${{ steps.current-time.outputs.formattedTime }}
       - name: Create Folder for buildcache
         run: New-Item ${{ env.BUILDCACHE_DIR }} -ItemType "directory" -Force
         shell: pwsh

.gitmodules

@@ -22,3 +22,6 @@
 [submodule "ThirdParty/regression-analysis"]
 	path = ThirdParty/regression-analysis
 	url = https://github.com/CeetronSolutions/regression-analysis.git
+[submodule "ThirdParty/tomlplusplus"]
+	path = ThirdParty/tomlplusplus
+	url = https://github.com/marzer/tomlplusplus.git

ApplicationExeCode/CMakeLists.txt

@@ -367,11 +367,11 @@ else()
   set(OPENVDS_LIB_NAMES
       libopenvds.so
       libopenvds.so.3
-      libopenvds.so.3.2.3
-      libopenvds-968eeb36.so.3.2.3
+      libopenvds.so.3.2.7
+      libopenvds-e1541338.so.3.2.7
       libsegyutils.so
       libsegyutils.so.3
-      libsegyutils.so.3.2.3
+      libsegyutils.so.3.2.7
   )
   foreach(OPENVDS_LIB_NAME ${OPENVDS_LIB_NAMES})
     list(APPEND RI_FILENAMES
@@ -380,15 +380,33 @@ else()
   endforeach(OPENVDS_LIB_NAME)
 endif(MSVC)
 
-# Copy dependencies to make it possible to run ResInsight from the build folder
-foreach(FILE_TO_COPY ${RI_FILENAMES})
-  add_custom_command(
-    TARGET ResInsight
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FILE_TO_COPY}
-            $<TARGET_FILE_DIR:ResInsight>
+# create an empty library target that will be used to copy files to the build
+# folder
+add_library(ResInsightDummyTarget EXCLUDE_FROM_ALL empty.cpp)
+set_property(TARGET ResInsightDummyTarget PROPERTY FOLDER "FileCopyTargets")
+
+# create a custom target that copies the files to the build folder
+foreach(riFileName ${RI_FILENAMES})
+  list(
+    APPEND
+    copyCommands
+    COMMAND
+    ${CMAKE_COMMAND}
+    -E
+    copy_if_different
+    ${riFileName}
+    $<TARGET_FILE_DIR:ResInsightDummyTarget>
   )
 endforeach()
+add_custom_target(
+  PreBuildFileCopy
+  COMMENT "PreBuildFileCopy step: copy runtime files into build folder"
+  ${copyCommands}
+)
+set_property(TARGET PreBuildFileCopy PROPERTY FOLDER "FileCopyTargets")
+
+# Make ResInsight depend on the prebuild target.
+add_dependencies(ResInsight PreBuildFileCopy)
 
 # Generate Python code in a target that is part of ALL_BUILD and depends on
 # ResInsight
@@ -715,10 +733,10 @@ if(RESINSIGHT_BUNDLE_OPENSSL)
       string(REPLACE "include" "bin" OPENSSL_BIN_DIR ${OPENSSL_BIN_DIR})
       message("OpenSSL binary dir: ${OPENSSL_BIN_DIR}")
 
-      install(FILES ${OPENSSL_BIN_DIR}/libcrypto-1_1-x64.dll
+      install(FILES ${OPENSSL_BIN_DIR}/libcrypto-3-x64.dll
               DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
       )
-      install(FILES ${OPENSSL_BIN_DIR}/libssl-1_1-x64.dll
+      install(FILES ${OPENSSL_BIN_DIR}/libssl-3-x64.dll
               DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
       )
     endif(OPENSSL_FOUND)
@@ -733,13 +751,13 @@ if(RESINSIGHT_BUNDLE_OPENSSL)
     install(FILES ${OPENSSL_BIN_DIR}/libcrypto.so
             DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
     )
-    install(FILES ${OPENSSL_BIN_DIR}/libcrypto.so.1.1
+    install(FILES ${OPENSSL_BIN_DIR}/libcrypto.so.3
             DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
     )
     install(FILES ${OPENSSL_BIN_DIR}/libssl.so
             DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
     )
-    install(FILES ${OPENSSL_BIN_DIR}/libssl.so.1.1
+    install(FILES ${OPENSSL_BIN_DIR}/libssl.so.3
             DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
     )
   endif()

ApplicationExeCode/empty.cpp

@@ -0,0 +1,10 @@
+//
+// This empty file is used by ResInsightDummyTarget
+//
+// Creating a dummy target with an empty file is used to have a different target than ResInsight.
+// This target is used to find the full path to the build folder.
+//
+// $<TARGET_FILE_DIR:ResInsightDummyTarget>
+//
+// If we use the ResInsight target ($<TARGET_FILE_DIR:ResInsight>), we get a circular dependency.
+//

ApplicationLibCode/Adm/LicenseInformation.txt

@@ -488,7 +488,7 @@ CRAVA is a software package for seismic inversion and conditioning of
 
 
 ===============================================================================
- Notice for the mio library
+ Notice for mio
 ===============================================================================
 
 Copyright 2017 https://github.com/mandreyel
@@ -512,7 +512,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 ===============================================================================
- Notice for the fast_float library
+ Notice for fast_float
 ===============================================================================
 
 https://github.com/fastfloat/fast_float
@@ -542,7 +542,7 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
 ===============================================================================
- Notice for the Qt-Advanced-Docking-System library
+ Notice for Qt-Advanced-Docking-System
 ===============================================================================
 
 https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System
@@ -561,7 +561,7 @@ https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/blob/master/LICEN
  the version number 2.1.]
 
 ===============================================================================
- Notice for the fmtlib library
+ Notice for fmtlib
 ===============================================================================
 
 https://github.com/fmtlib/fmt
@@ -596,7 +596,7 @@ source code, you may redistribute such embedded portions in such object form
 without including the above copyright and permission notices.
 
 ===============================================================================
- Notice for the roffcpp library
+ Notice for roffcpp
 ===============================================================================
 
 https://github.com/CeetronSolutions/roffcpp
@@ -617,7 +617,7 @@ See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
 for more details.
 
 ===============================================================================
- Notice for the open-vds library
+ Notice for open-vds
 ===============================================================================
 
 https://community.opengroup.org/osdu/platform/domain-data-mgmt-services/seismic/open-vds/-/blob/master/LICENSE
@@ -629,7 +629,7 @@ https://community.opengroup.org/osdu/platform/domain-data-mgmt-services/seismic/
 
 
 ===============================================================================
- Notice for the open-zgy library
+ Notice for open-zgy
 ===============================================================================
 
 https://community.opengroup.org/osdu/platform/domain-data-mgmt-services/seismic/open-zgy/-/blob/master/LICENSE.txt
@@ -641,7 +641,7 @@ https://community.opengroup.org/osdu/platform/domain-data-mgmt-services/seismic/
 
 
 ===============================================================================
- Notice for the regression-analysis library
+ Notice for regression-analysis
 ===============================================================================
 
 https://github.com/CeetronSolutions/regression-analysis
@@ -660,3 +660,26 @@ FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
 for more details.
+
+===============================================================================
+ Notice for tomlplusplus
+===============================================================================
+
+https://github.com/marzer/tomlplusplus/blob/master/LICENSE
+
+MIT License
+
+Copyright (c) Mark Gillard <mark.gillard@outlook.com.au>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.