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

Download and use openvds package (#10153)

Browse Source 
Download and use openvds package
This commit is contained in:
Magne Sjaastad 2023-04-24 17:10:51 +02:00 committed by GitHub
parent 9949e84420
commit 90ccf447fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationExeCode/CMakeLists.txt
View File

@ -347,7 +347,7 @@ if(MSVC)
set(OPENVDS_DLL_NAMES openvds segyutils) set(OPENVDS_DLL_NAMES openvds segyutils)
foreach(OPENVDS_DLL_NAME ${OPENVDS_DLL_NAMES}) foreach(OPENVDS_DLL_NAME ${OPENVDS_DLL_NAMES})
list(APPEND RI_DLL_FILENAMES list(APPEND RI_DLL_FILENAMES
${RESINSIGHT_OPENVDS_API_DIR}/lib/${OPENVDS_DLL_NAME}.dll ${RESINSIGHT_OPENVDS_API_DIR}/bin/msvc_141/${OPENVDS_DLL_NAME}.dll
) )
endforeach(OPENVDS_DLL_NAME) endforeach(OPENVDS_DLL_NAME)
endif() endif()

55
CMakeLists.txt
View File

@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.15) cmake_minimum_required(VERSION 3.15)
include(CheckCSourceCompiles) include(CheckCSourceCompiles)
include(FetchContent)
project(ResInsight) project(ResInsight)
set(VIZ_MODULES_FOLDER_NAME Fwk/VizFwk) set(VIZ_MODULES_FOLDER_NAME Fwk/VizFwk)
@ -9,6 +11,9 @@ cmake_policy(SET CMP0020 NEW)
if(POLICY CMP0077) if(POLICY CMP0077)
cmake_policy(SET CMP0077 NEW) cmake_policy(SET CMP0077 NEW)
endif() endif()
if(POLICY CMP0135)
cmake_policy(SET CMP0135 OLD)
endif()
if(UNIX) if(UNIX)
option( option(
@ -318,12 +323,23 @@ endif()
# ############################################################################## # ##############################################################################
# OpenVDS seismic file access # OpenVDS seismic file access
# ############################################################################## # ##############################################################################
set(RESINSIGHT_OPENVDS_API_DIR
"" if(MSVC)
CACHE FetchContent_Declare(
PATH openvds
"Optional path to the OpenVDS API. Adds support for OpenVDS seismic files" URL https://bluware.jfrog.io/artifactory/Releases-OpenVDSPlus/3.2/openvds+-3.2.3-win.zip
) )
else()
FetchContent_Declare(
openvds
URL https://bluware.jfrog.io/artifactory/Releases-OpenVDSPlus/3.2/openvds+-3.2.3-manylinux_2014.tar.gz
)
endif()
FetchContent_Populate(openvds)
set(RESINSIGHT_OPENVDS_API_DIR ${openvds_SOURCE_DIR})
if(NOT ${RESINSIGHT_OPENVDS_API_DIR} EQUAL "") if(NOT ${RESINSIGHT_OPENVDS_API_DIR} EQUAL "")
add_definitions(-DUSE_OPENVDS) add_definitions(-DUSE_OPENVDS)
set(RESINSIGHT_USE_OPENVDS_API 1) set(RESINSIGHT_USE_OPENVDS_API 1)
@ -331,13 +347,11 @@ if(NOT ${RESINSIGHT_OPENVDS_API_DIR} EQUAL "")
if(MSVC) if(MSVC)
list(APPEND EXTERNAL_LINK_LIBRARIES list(APPEND EXTERNAL_LINK_LIBRARIES
${RESINSIGHT_OPENVDS_API_DIR}/lib/segyutils.lib ${RESINSIGHT_OPENVDS_API_DIR}/lib/msvc_141/openvds.lib
${RESINSIGHT_OPENVDS_API_DIR}/lib/openvds.lib
) )
else() else()
list(APPEND EXTERNAL_LINK_LIBRARIES list(APPEND EXTERNAL_LINK_LIBRARIES
${RESINSIGHT_OPENVDS_API_DIR}/lib/libsegyutils.so ${RESINSIGHT_OPENVDS_API_DIR}/lib64/libopenvds.so
${RESINSIGHT_OPENVDS_API_DIR}/lib/libopenvds.so
) )
endif() endif()
endif() endif()
@ -796,6 +810,27 @@ if(RESINSIGHT_BUNDLE_TESTMODELS)
) )
endif() endif()
if(NOT ${RESINSIGHT_OPENVDS_API_DIR} EQUAL "")
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(OPENVDS_SHARED_LIB_FILES
${RESINSIGHT_OPENVDS_API_DIR}/lib64/libopenvds.so
${RESINSIGHT_OPENVDS_API_DIR}/lib64/libopenvds.so.3
${RESINSIGHT_OPENVDS_API_DIR}/lib64/libopenvds.so.3.2.3
${RESINSIGHT_OPENVDS_API_DIR}/lib64/libopenvds-968eeb36.so.3.2.3
${RESINSIGHT_OPENVDS_API_DIR}/lib64/libsegyutils.so
${RESINSIGHT_OPENVDS_API_DIR}/lib64/libsegyutils.so.3
${RESINSIGHT_OPENVDS_API_DIR}/lib64/libsegyutils.so.3.2.3
)
install(FILES ${OPENVDS_SHARED_LIB_FILES}
DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
)
install(PROGRAMS ${RESINSIGHT_OPENVDS_API_DIR}/bin/SEGYImport
DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
)
endif()
endif()
# ############################################################################## # ##############################################################################
# Application # Application
# ############################################################################## # ##############################################################################