Update CMake files.

Applications/ApplicationsLib/CMakeLists.txt

@@ -10,7 +10,7 @@ endif()
 
 target_link_libraries(ApplicationsLib
     PUBLIC BaseLib GeoLib Processes logog
-    PRIVATE MathLib MeshLib MeshGeoToolsLib NumLib
+    PRIVATE MathLib MeshLib MeshGeoToolsLib NumLib ParameterLib
 )
 
 # Set cpp definitions if the cmake option is enabled for the given process.

CMakeLists.txt

@@ -333,6 +333,7 @@ add_subdirectory( MeshLib )
 add_subdirectory( MeshGeoToolsLib )
 add_subdirectory( NumLib )
 if(OGS_BUILD_CLI OR OGS_BUILD_UTILS OR BUILD_TESTING)
+    add_subdirectory( ParameterLib )
     add_subdirectory( MaterialLib )
     add_subdirectory( ProcessLib )
 endif()

MaterialLib/CMakeLists.txt

@@ -39,8 +39,8 @@ target_include_directories(MaterialLib
 )
 
 target_link_libraries(MaterialLib
-    PUBLIC MaterialLib_SolidModels_MFront # ProcessLib
-    PRIVATE MathLib MeshLib
+    PUBLIC MaterialLib_SolidModels_MFront
+    PRIVATE MathLib MeshLib ParameterLib
 )
 
 if(OGS_USE_PCH)

ParameterLib/CMakeLists.txt

+# Source files
+get_source_files(SOURCES)
+
+add_library(ParameterLib ${SOURCES})
+if(BUILD_SHARED_LIBS)
+    install(TARGETS ParameterLib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif()
+
+include(GenerateExportHeader)
+generate_export_header(ParameterLib)
+target_include_directories(ParameterLib
+    PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+target_link_libraries(ParameterLib PRIVATE BaseLib MeshLib)
+
+if(OGS_USE_PCH)
+    cotire(ParameterLib)
+endif()

ProcessLib/CMakeLists.txt

@@ -15,7 +15,6 @@ APPEND_SOURCE_FILES(SOURCES)
 APPEND_SOURCE_FILES(SOURCES BoundaryCondition)
 APPEND_SOURCE_FILES(SOURCES SurfaceFlux)
 APPEND_SOURCE_FILES(SOURCES Output)
-APPEND_SOURCE_FILES(SOURCES Parameter)
 APPEND_SOURCE_FILES(SOURCES SourceTerms)
 APPEND_SOURCE_FILES(SOURCES Utils)
 
@@ -25,7 +24,16 @@ if(BUILD_SHARED_LIBS)
 endif()
 
 target_link_libraries(ProcessLib
-    PUBLIC BaseLib MaterialLib MathLib MeshLib NumLib logog MeshGeoToolsLib
+    PUBLIC
+        BaseLib
+        MaterialLib
+        MathLib
+        MeshGeoToolsLib
+        MeshLib
+        NumLib
+        logog
+    PRIVATE
+        ParameterLib
 )
 
 if(OGS_USE_PYTHON)

ProcessLib/ComponentTransport/CMakeLists.txt

@@ -7,6 +7,7 @@ endif()
 
 target_link_libraries(ComponentTransport
     PUBLIC ProcessLib
+    PRIVATE ParameterLib
 )
 
 include(Tests.cmake)

ProcessLib/GroundwaterFlow/CMakeLists.txt

@@ -7,6 +7,7 @@ endif()
 
 target_link_libraries(GroundwaterFlow
     PUBLIC ProcessLib
+    PRIVATE ParameterLib
 )
 
 include(Tests.cmake)

ProcessLib/HT/CMakeLists.txt

@@ -4,6 +4,9 @@ add_library(HT ${SOURCES})
 if(BUILD_SHARED_LIBS)
     install(TARGETS HT LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
-target_link_libraries(HT PUBLIC ProcessLib)
+target_link_libraries(HT
+    PUBLIC ProcessLib
+    PRIVATE ParameterLib
+)
 
 include(Tests.cmake)

ProcessLib/HeatConduction/CMakeLists.txt

@@ -4,6 +4,9 @@ add_library(HeatConduction ${SOURCES})
 if(BUILD_SHARED_LIBS)
     install(TARGETS HeatConduction LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
-target_link_libraries(HeatConduction PUBLIC ProcessLib)
+target_link_libraries(HeatConduction
+    PUBLIC ProcessLib
+    PRIVATE ParameterLib
+)
 
 include(Tests.cmake)

ProcessLib/HeatTransportBHE/CMakeLists.txt

@@ -3,9 +3,12 @@ APPEND_SOURCE_FILES(SOURCES BHE)
 APPEND_SOURCE_FILES(SOURCES LocalAssemblers)
 
 add_library(HeatTransportBHE ${SOURCES})
-target_link_libraries(HeatTransportBHE PUBLIC ProcessLib)
 if(BUILD_SHARED_LIBS)
     install(TARGETS HeatTransportBHE LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
+target_link_libraries(HeatTransportBHE
+    PUBLIC ProcessLib
+    PRIVATE ParameterLib
+)
 
 include(Tests.cmake)

ProcessLib/HydroMechanics/CMakeLists.txt

@@ -4,6 +4,9 @@ add_library(HydroMechanics ${SOURCES})
 if(BUILD_SHARED_LIBS)
     install(TARGETS HydroMechanics LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
-target_link_libraries(HydroMechanics PUBLIC ProcessLib)
+target_link_libraries(HydroMechanics
+    PUBLIC ProcessLib
+    PRIVATE ParameterLib
+)
 
 include(Tests.cmake)

ProcessLib/LIE/CMakeLists.txt

@@ -8,7 +8,10 @@ add_library(LIE ${SOURCES})
 if(BUILD_SHARED_LIBS)
     install(TARGETS LIE LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
-target_link_libraries(LIE PUBLIC ProcessLib LIECommon)
+target_link_libraries(LIE
+    PUBLIC ProcessLib LIECommon
+    PRIVATE ParameterLib
+)
 
 include(HydroMechanics/Tests.cmake)
 include(SmallDeformation/Tests.cmake)

ProcessLib/LiquidFlow/CMakeLists.txt

@@ -4,6 +4,9 @@ add_library(LiquidFlow ${SOURCES})
 if(BUILD_SHARED_LIBS)
     install(TARGETS LiquidFlow LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
-target_link_libraries(LiquidFlow PUBLIC ProcessLib)
+target_link_libraries(LiquidFlow
+    PUBLIC ProcessLib
+    PRIVATE ParameterLib
+)
 
 include(Tests.cmake)

ProcessLib/PhaseField/CMakeLists.txt

@@ -4,6 +4,9 @@ add_library(PhaseField ${SOURCES})
 if(BUILD_SHARED_LIBS)
     install(TARGETS PhaseField LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
-target_link_libraries(PhaseField PUBLIC ProcessLib)
+target_link_libraries(PhaseField
+    PUBLIC ProcessLib
+    PRIVATE ParameterLib
+)
 
 include(Tests.cmake)

ProcessLib/RichardsComponentTransport/CMakeLists.txt

@@ -4,6 +4,9 @@ add_library(RichardsComponentTransport ${SOURCES})
 if(BUILD_SHARED_LIBS)
     install(TARGETS RichardsComponentTransport LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
-target_link_libraries(RichardsComponentTransport PUBLIC ProcessLib)
+target_link_libraries(RichardsComponentTransport
+    PUBLIC ProcessLib
+    PRIVATE ParameterLib
+)
 
 include(Tests.cmake)

ProcessLib/RichardsFlow/CMakeLists.txt

@@ -4,6 +4,9 @@ add_library(RichardsFlow ${SOURCES})
 if(BUILD_SHARED_LIBS)
     install(TARGETS RichardsFlow LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
-target_link_libraries(RichardsFlow PUBLIC ProcessLib)
+target_link_libraries(RichardsFlow
+    PUBLIC ProcessLib
+    PRIVATE ParameterLib
+)
 
 include(Tests.cmake)

ProcessLib/RichardsMechanics/CMakeLists.txt

@@ -4,6 +4,9 @@ add_library(RichardsMechanics ${SOURCES})
 if(BUILD_SHARED_LIBS)
     install(TARGETS RichardsMechanics LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
-target_link_libraries(RichardsMechanics PUBLIC ProcessLib RichardsFlow)
+target_link_libraries(RichardsMechanics
+    PUBLIC ProcessLib
+    PRIVATE RichardsFlow ParameterLib
+)
 
 include(Tests.cmake)

ProcessLib/SmallDeformation/CMakeLists.txt

@@ -4,6 +4,9 @@ add_library(SmallDeformation ${SOURCES})
 if(BUILD_SHARED_LIBS)
     install(TARGETS SmallDeformation LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
-target_link_libraries(SmallDeformation PUBLIC ProcessLib)
+target_link_libraries(SmallDeformation
+    PUBLIC ProcessLib
+    PRIVATE ParameterLib
+)
 
 include(Tests.cmake)

ProcessLib/SmallDeformationNonlocal/CMakeLists.txt

 APPEND_SOURCE_FILES(SOURCES)
 
 add_library(SmallDeformationNonlocal ${SOURCES})
-target_link_libraries(SmallDeformationNonlocal PUBLIC ProcessLib)
+target_link_libraries(SmallDeformationNonlocal
+    PUBLIC ProcessLib
+    PRIVATE ParameterLib
+)
 
 include(Tests.cmake)

ProcessLib/TES/CMakeLists.txt

@@ -4,6 +4,9 @@ add_library(TES ${SOURCES})
 if(BUILD_SHARED_LIBS)
     install(TARGETS TES LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
-target_link_libraries(TES PUBLIC ProcessLib)
+target_link_libraries(TES
+    PUBLIC ProcessLib
+    PRIVATE ParameterLib
+)
 
 include(Tests.cmake)