Commit 27981955 authored by Ansgar Burchardt's avatar Ansgar Burchardt

Merge branch 'cherry-pick-4007b3ed' into 'releases/2.5'

Merge branch 'bugfix/UseUG-pass-OBJECT-option' into 'master'

See merge request !149
parents 08643ae1 6a602466
Pipeline #1734 passed with stage
in 241 minutes and 25 seconds
......@@ -175,6 +175,12 @@ function(add_dune_ug_flags)
set(_prefix TARGET)
endif()
if(ADD_UG_OBJECT)
set(_object OBJECT)
else()
set(_object)
endif()
# Add compiler flags
include_directories(${UG_INCLUDES})
set_property(${_prefix} ${ADD_UG_UNPARSED_ARGUMENTS}
......@@ -203,7 +209,7 @@ function(add_dune_ug_flags)
APPEND PROPERTY
COMPILE_DEFINITIONS ModelP)
# Add mpi flags.
add_dune_mpi_flags(${ADD_UG_UNPARSED_ARGUMENTS} ${_source_only})
add_dune_mpi_flags(${ADD_UG_UNPARSED_ARGUMENTS} ${_source_only} ${_object})
endif()
endif()
endfunction(add_dune_ug_flags)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment