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

Merge branch 'dev' into cmake-improvements

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-28 08:33:39 +01:00
parent 89c090ba24 267e3ef59d
commit 25a1823f35
141 changed files with 1097 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/CMakeLists.txt
View File

@@ -117,14 +117,8 @@ list( APPEND REFERENCED_CMAKE_FILES
CommandFileInterface/CMakeLists_files.cmake
CommandFileInterface/Core/CMakeLists_files.cmake
)
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
list (APPEND REFERENCED_CMAKE_FILES
Commands/FractureCommands/CMakeLists_files.cmake
)
endif()
)
option (RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS "Include ApplicationCode Unit Tests" OFF)
if (RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS)
@@ -189,11 +183,6 @@ if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
endif()
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
add_definitions(-DUSE_PROTOTYPE_FEATURE_FRACTURES)
endif()
#############################################################################
# Qt specifics: Moc, ui, resources
#############################################################################
@@ -558,10 +547,6 @@ if(RESINSIGHT_FOUND_HDF5)
set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_souring")
endif()
if(RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_fractures")
endif()
# Append el5 when compiled on RHEL5 and el6 if compiled on RHEL6
if (NOT "${RESINSIGHT_RHEL_SYSTEM_NAME}" STREQUAL "")
set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_${RESINSIGHT_RHEL_SYSTEM_NAME}")