GeoMech with OdbReader Included in ResInsight Build

Preliminary, first shot.
Added first iteration on basic visualization code.
This commit is contained in:
Jacob Støren
2015-04-24 15:53:50 +02:00
parent 6dad519f30
commit a538be1775
15 changed files with 723 additions and 48 deletions

View File

@@ -20,6 +20,9 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel
${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel
${CMAKE_CURRENT_SOURCE_DIR}/WellPathImportSsihub
${CMAKE_CURRENT_SOURCE_DIR}/GeoMech/OdbReader
${CMAKE_CURRENT_SOURCE_DIR}/GeoMech/GeoMechDataModel
${CMAKE_BINARY_DIR}/Generated
${CMAKE_CURRENT_BINARY_DIR}
)
@@ -76,6 +79,7 @@ list( APPEND REFERENCED_CMAKE_FILES
FileInterface/CMakeLists_files.cmake
ProjectDataModel/CMakeLists_files.cmake
ModelVisualization/CMakeLists_files.cmake
GeoMech/GeoMechVisualization/CMakeLists_files.cmake
)
# Include source file lists from *.cmake files
@@ -89,6 +93,12 @@ list( APPEND CPP_SOURCES
add_subdirectory(WellPathImportSsihub)
add_subdirectory(GeoMech/GeoMechDataModel)
include(GeoMech/OdbReader/OdbSetup.cmake)
add_subdirectory(GeoMech/OdbReader)
# Define files for MOC-ing
set ( QT_MOC_HEADERS
@@ -274,6 +284,7 @@ endif()
target_link_libraries( ResInsight ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES})
# Copy Dlls
if (MSVC)