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

Merge pull request #3471 from akva2/fix_variants_poly

Browse Source 
fix build without variants and/or poly grid
This commit is contained in:
Joakim Hove 2021-08-17 09:08:29 +02:00 committed by GitHub
commit 7a73547d01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
CMakeLists.txt
View File

@ -325,6 +325,18 @@ else()
set(FLOW_DEFAULT_ENABLE_IF "TRUE") set(FLOW_DEFAULT_ENABLE_IF "TRUE")
endif() endif()
if (NOT BUILD_FLOW_VARIANTS)
set(FLOW_VARIANTS_DEFAULT_ENABLE_IF "FALSE")
else()
set(FLOW_VARIANTS_DEFAULT_ENABLE_IF "TRUE")
endif()
if (NOT BUILD_FLOW_POLY_GRID)
set(FLOW_POLY_ONLY_DEFAULT_ENABLE_IF "FALSE")
else()
set(FLOW_POLY_ONLY_DEFAULT_ENABLE_IF "TRUE")
endif()
add_library(moduleVersion OBJECT opm/simulators/utils/moduleVersion.cpp) add_library(moduleVersion OBJECT opm/simulators/utils/moduleVersion.cpp)
set_property(TARGET moduleVersion PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET moduleVersion PROPERTY POSITION_INDEPENDENT_CODE ON)
@ -345,21 +357,20 @@ foreach(OBJ ${COMMON_MODELS} ${FLOW_MODELS})
endforeach() endforeach()
set_property(TARGET flow_libblackoil PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET flow_libblackoil PROPERTY POSITION_INDEPENDENT_CODE ON)
if(BUILD_FLOW_VARIANTS) add_library(flow_libonephase_energy OBJECT flow/flow_ebos_onephase_energy.cpp)
add_library(flow_libonephase_energy OBJECT flow/flow_ebos_onephase_energy.cpp) add_library(flow_libonephase OBJECT flow/flow_ebos_onephase.cpp)
add_library(flow_libonephase OBJECT flow/flow_ebos_onephase.cpp) if(TARGET fmt::fmt)
if(TARGET fmt::fmt) target_link_libraries(flow_libonephase_energy fmt::fmt)
target_link_libraries(flow_libonephase_energy fmt::fmt) target_link_libraries(flow_libonephase fmt::fmt)
target_link_libraries(flow_libonephase fmt::fmt)
endif()
endif() endif()
set_property(TARGET flow_libonephase PROPERTY EXCLUDE_FROM_ALL ${FLOW_VARIANTS_DEFAULT_ENABLE_IF})
set_property(TARGET flow_libonephase_energy PROPERTY EXCLUDE_FROM_ALL ${FLOW_VARIANTS_DEFAULT_ENABLE_IF})
if(BUILD_FLOW_POLY_GRID) add_library(flow_libblackoil_poly OBJECT flow/flow_ebos_blackoil_poly.cpp)
add_library(flow_libblackoil_poly OBJECT flow/flow_ebos_blackoil_poly.cpp) if(TARGET fmt::fmt)
if(TARGET fmt::fmt) target_link_libraries(flow_libblackoil_poly fmt::fmt)
target_link_libraries(flow_libblackoil_poly fmt::fmt) endif()
endif() set_property(TARGET flow_libblackoil_poly PROPERTY EXCLUDE_FROM_ALL ${FLOW_POLY_ONLY_DEFAULT_ENABLE_IF})
endif()
# the production oriented general-purpose ECL simulator # the production oriented general-purpose ECL simulator
opm_add_test(flow opm_add_test(flow
@ -394,12 +405,6 @@ opm_add_test(flow_blackoil
$<TARGET_OBJECTS:moduleVersion>) $<TARGET_OBJECTS:moduleVersion>)
target_compile_definitions(flow_blackoil PRIVATE "FLOW_BLACKOIL_ONLY") target_compile_definitions(flow_blackoil PRIVATE "FLOW_BLACKOIL_ONLY")
if (NOT BUILD_FLOW_POLY_GRID)
set(FLOW_POLY_ONLY_DEFAULT_ENABLE_IF "FALSE")
else()
set(FLOW_POLY_ONLY_DEFAULT_ENABLE_IF "TRUE")
endif()
# the production oriented general-purpose ECL simulator # the production oriented general-purpose ECL simulator
opm_add_test(flow_poly opm_add_test(flow_poly
ONLY_COMPILE ONLY_COMPILE
@ -426,12 +431,6 @@ opm_add_test(flow_distribute_z
$<TARGET_OBJECTS:moduleVersion> $<TARGET_OBJECTS:moduleVersion>
) )
if (NOT BUILD_FLOW_VARIANTS)
set(FLOW_VARIANTS_DEFAULT_ENABLE_IF "FALSE")
else()
set(FLOW_VARIANTS_DEFAULT_ENABLE_IF "TRUE")
endif()
# Variant versions of Flow. # Variant versions of Flow.
opm_add_test(flow_blackoil_dunecpr opm_add_test(flow_blackoil_dunecpr
ONLY_COMPILE ONLY_COMPILE