mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-09 23:16:00 -06:00
Working ResInsight with Odb linked, hacklish
This commit is contained in:
parent
a538be1775
commit
c3ec79d6e1
@ -94,8 +94,7 @@ list( APPEND CPP_SOURCES
|
||||
add_subdirectory(WellPathImportSsihub)
|
||||
|
||||
add_subdirectory(GeoMech/GeoMechDataModel)
|
||||
|
||||
include(GeoMech/OdbReader/OdbSetup.cmake)
|
||||
set(RI_ODB_API_DIR C:/pfRoot/jjsOnJacobpcCsdep/User/Sigurd/OdbApiExperiments/OdbApi/x64 CACHE PATH "Path tho the ODB api from Simulia")
|
||||
|
||||
add_subdirectory(GeoMech/OdbReader)
|
||||
|
||||
@ -264,6 +263,9 @@ set( LINK_LIBRARIES
|
||||
LibGeometry
|
||||
LibCore
|
||||
|
||||
RigGeoMechDataModel
|
||||
RifOdbReader
|
||||
|
||||
ecl
|
||||
ert_util
|
||||
ert_geometry
|
||||
@ -286,6 +288,27 @@ target_link_libraries( ResInsight ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES})
|
||||
|
||||
|
||||
# Copy Dlls
|
||||
# Copy Odb Dlls
|
||||
|
||||
if (MSVC)
|
||||
# Find all the dlls
|
||||
file (GLOB RI_ALL_ODB_DLLS ${RI_ODB_API_DIR}/lib/*.dll)
|
||||
|
||||
# Strip off the path
|
||||
foreach (aDLL ${RI_ALL_ODB_DLLS})
|
||||
get_filename_component(filenameWithExt ${aDLL} NAME)
|
||||
list(APPEND RI_ODB_DLLS ${filenameWithExt} )
|
||||
endforeach(aDLL)
|
||||
|
||||
# Copy to target directory
|
||||
foreach (aDLL ${RI_ODB_DLLS})
|
||||
add_custom_command(TARGET ResInsight POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${RI_ODB_API_DIR}/lib/${aDLL}" "$<TARGET_FILE_DIR:ResInsight>")
|
||||
endforeach()
|
||||
|
||||
endif(MSVC)
|
||||
|
||||
|
||||
if (MSVC)
|
||||
|
||||
# Qt DLLs
|
||||
|
@ -5,6 +5,7 @@ project (RifOdbReader)
|
||||
add_definitions(-DHKS_NT)
|
||||
add_definitions(-DABQ_WIN86_64)
|
||||
|
||||
|
||||
include_directories(
|
||||
${RI_ODB_API_DIR}/include
|
||||
${RigGeoMechDataModel_SOURCE_DIR}
|
||||
|
@ -1,7 +1,6 @@
|
||||
|
||||
# Copy Odb Dlls
|
||||
|
||||
set(RI_ODB_API_DIR C:/pfRoot/jjsOnJacobpcCsdep/User/Sigurd/OdbApiExperiments/OdbApi/x64 CACHE PATH "Path tho the ODB api from Simulia")
|
||||
if (MSVC)
|
||||
# Find all the dlls
|
||||
file (GLOB RI_ALL_ODB_DLLS ${RI_ODB_API_DIR}/lib/*.dll)
|
||||
|
Loading…
Reference in New Issue
Block a user