OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

OpenVDS should always be used (#10166)

Browse Source 
* OpenVDS should always be used, remove optional defines
This commit is contained in:
jonjenssen
2023-04-24 18:23:31 +02:00
committed by GitHub
parent 90ccf447fb
commit d8def3d986
6 changed files with 36 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationExeCode/CMakeLists.txt
View File

@@ -322,10 +322,6 @@ if(MSVC)
set(RESINSIGHT_USE_ODB_API 1)
endif()
if(NOT ${RESINSIGHT_OPENVDS_API_DIR} EQUAL "")
set(RESINSIGHT_USE_OPENVDS_API 1)
endif()
# Odb Dlls
if(RESINSIGHT_USE_ODB_API)
# Find all the dlls
@@ -343,14 +339,12 @@ if(MSVC)
endif()
# OpenVDS Dlls
if(RESINSIGHT_USE_OPENVDS_API)
set(OPENVDS_DLL_NAMES openvds segyutils)
foreach(OPENVDS_DLL_NAME ${OPENVDS_DLL_NAMES})
list(APPEND RI_DLL_FILENAMES
${RESINSIGHT_OPENVDS_API_DIR}/bin/msvc_141/${OPENVDS_DLL_NAME}.dll
)
endforeach(OPENVDS_DLL_NAME)
endif()
set(OPENVDS_DLL_NAMES openvds segyutils)
foreach(OPENVDS_DLL_NAME ${OPENVDS_DLL_NAMES})
list(APPEND RI_DLL_FILENAMES
${RESINSIGHT_OPENVDS_API_DIR}/bin/msvc_141/${OPENVDS_DLL_NAME}.dll
)
endforeach(OPENVDS_DLL_NAME)
# HDF5 Dlls
if(RESINSIGHT_FOUND_HDF5)