Merge branch 'kelvin-vector' into 'master'

[MatL] Add explicit template instantiation declarations. See merge request ogs/ogs!5131
ufz · Oct 9, 2024 · 01b17f7 · 01b17f7
2 parents 8976644 + ea93ab7
commit 01b17f7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/MaterialLib/CMakeLists.txt b/MaterialLib/CMakeLists.txt
@@ -32,8 +32,13 @@ append_source_files(SOURCES PorousMedium/UnsaturatedProperty/CapillaryPressure)
 append_source_files(
  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(
  MaterialLib PUBLIC BaseLib Eigen3::Eigen MaterialLib_SolidModels

diff --git a/MaterialLib/MPL/Utils/FormKelvinVector.h b/MaterialLib/MPL/Utils/FormKelvinVector.h
@@ -35,4 +35,10 @@ template <int GlobalDim>
 MathLib::KelvinVector::KelvinVectorType<GlobalDim> formKelvinVector(
  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