Skip to content
Snippets Groups Projects
Commit 01b17f73 authored by Lars Bilke's avatar Lars Bilke
Browse files

Merge branch 'kelvin-vector' into 'master'

[MatL] Add explicit template instantiation declarations.

See merge request ogs/ogs!5131
parents 89766447 ea93ab7a
No related branches found
No related tags found
No related merge requests found
...@@ -32,8 +32,13 @@ append_source_files(SOURCES PorousMedium/UnsaturatedProperty/CapillaryPressure) ...@@ -32,8 +32,13 @@ append_source_files(SOURCES PorousMedium/UnsaturatedProperty/CapillaryPressure)
append_source_files( append_source_files(
SOURCES PorousMedium/UnsaturatedProperty/RelativePermeability SOURCES PorousMedium/UnsaturatedProperty/RelativePermeability
) )
if(CONDA_BUILD)
set(_static_on_conda STATIC)
endif()
ogs_add_library(MaterialLib GENERATE_EXPORT_HEADER ${SOURCES}) ogs_add_library(
MaterialLib GENERATE_EXPORT_HEADER ${_static_on_conda} ${SOURCES}
)
target_link_libraries( target_link_libraries(
MaterialLib PUBLIC BaseLib Eigen3::Eigen MaterialLib_SolidModels MaterialLib PUBLIC BaseLib Eigen3::Eigen MaterialLib_SolidModels
......
...@@ -35,4 +35,10 @@ template <int GlobalDim> ...@@ -35,4 +35,10 @@ template <int GlobalDim>
MathLib::KelvinVector::KelvinVectorType<GlobalDim> formKelvinVector( MathLib::KelvinVector::KelvinVectorType<GlobalDim> formKelvinVector(
MaterialPropertyLib::PropertyDataType const& values); MaterialPropertyLib::PropertyDataType const& values);
extern template MathLib::KelvinVector::KelvinVectorType<2> formKelvinVector<2>(
MaterialPropertyLib::PropertyDataType const& values);
extern template MathLib::KelvinVector::KelvinVectorType<3> formKelvinVector<3>(
MaterialPropertyLib::PropertyDataType const& values);
} // namespace MaterialPropertyLib } // namespace MaterialPropertyLib
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment