[CMake] Corrected remaining dependencies.

Applications/ApplicationsLib/CMakeLists.txt

@@ -6,9 +6,8 @@ set(LIB_SOURCES ${SOURCES_APPLICATIONSLIB})
 add_library(ApplicationsLib ${LIB_SOURCES})
 
 target_link_libraries(ApplicationsLib
-    MeshGeoToolsLib
-    NumLib
-    ProcessLib
+    PUBLIC BaseLib GeoLib NumLib ProcessLib logog
+    PRIVATE MathLib MeshLib
 )
 
 if(TARGET Eigen)

Applications/CLI/CMakeLists.txt

@@ -2,20 +2,17 @@
 add_executable(ogs ogs.cpp)
 
 target_link_libraries(ogs
-    ApplicationsLib
-    MeshGeoToolsLib
-    ProcessLib
-    NumLib
+    PRIVATE BaseLib ApplicationsLib NumLib ProcessLib
 )
 
 ADD_VTK_DEPENDENCY(ogs)
 
 if(OGS_USE_PETSC)
-    target_link_libraries(ogs ${PETSC_LIBRARIES})
+    target_link_libraries(ogs PRIVATE ${PETSC_LIBRARIES})
 endif()
 
 if(OGS_INSITU)
-    target_link_libraries(ogs InSituLib)
+    target_link_libraries(ogs PRIVATE InSituLib)
 endif()
 
 if(OGS_USE_PCH)

Applications/DataHolderLib/CMakeLists.txt

@@ -5,9 +5,8 @@ GET_SOURCE_FILES(SOURCES_DataHolderLib)
 add_library(DataHolderLib ${SOURCES_DataHolderLib})
 
 target_link_libraries(DataHolderLib
-    GeoLib
-    MeshLib
-    logog
+    PUBLIC GeoLib MeshLib
+    PRIVATE BaseLib logog
 )
 
 if(OGS_USE_PCH)

Applications/FileIO/CMakeLists.txt

@@ -19,10 +19,17 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/OGSEnabledElements.cmake)
 
 # Create the library
 add_library(ApplicationsFileIO ${SOURCES})
-target_link_libraries(ApplicationsFileIO DataHolderLib)
+target_link_libraries(ApplicationsFileIO
+    PUBLIC BaseLib DataHolderLib GeoLib MathLib logog
+    PRIVATE ApplicationsLib MeshLib
+)
 
 if(Shapelib_FOUND)
-    target_link_libraries(ApplicationsFileIO ${Shapelib_LIBRARIES})
+    target_link_libraries(ApplicationsFileIO PRIVATE ${Shapelib_LIBRARIES})
+endif()
+
+if(OGS_BUILD_SWMM)
+    target_link_libraries(ApplicationsFileIO PRIVATE SwmmInterface)
 endif()
 
 ADD_VTK_DEPENDENCY(ApplicationsFileIO)

Applications/InSituLib/CMakeLists.txt

@@ -3,6 +3,9 @@ GET_SOURCE_FILES(SOURCES)
 
 # Library
 add_library(InSituLib ${SOURCES})
+
+target_link_libraries(PUBLIC BaseLib PRIVATE MeshLib)
+
 if(OGS_USE_PCH)
     cotire(InSituLib)
 endif()

BaseLib/CMakeLists.txt

@@ -14,18 +14,16 @@ add_library(BaseLib ${SOURCES})
 
 set_target_properties(BaseLib PROPERTIES LINKER_LANGUAGE CXX)
 
-target_link_libraries(BaseLib
-    logog
-)
+target_link_libraries(BaseLib PUBLIC logog)
 
 if(MSVC)
-    target_link_libraries(BaseLib WinMM) # needed for timeGetTime
+    target_link_libraries(BaseLib PRIVATE WinMM) # needed for timeGetTime
 endif()
 
 if(Qt5XmlPatterns_FOUND)
-    target_link_libraries(BaseLib Qt5::Xml Qt5::XmlPatterns)
+    target_link_libraries(BaseLib PUBLIC Qt5::Xml Qt5::XmlPatterns)
     if(WIN32 AND CMAKE_CROSSCOMPILING AND OPENSSL_FOUND)
-        target_link_libraries(BaseLib Qt5::Network ${OPENSSL_LIBRARIES} ws2_32)
+        target_link_libraries(BaseLib PUBLIC Qt5::Network ${OPENSSL_LIBRARIES} ws2_32)
     endif()
 endif()
 

GeoLib/CMakeLists.txt

@@ -16,14 +16,12 @@ add_library(GeoLib ${SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/tetgen/predicates.cxx
 )
 
-target_link_libraries(GeoLib
-    MathLib
-)
+target_link_libraries(GeoLib PUBLIC BaseLib MathLib logog)
 
 if(Qt5XmlPatterns_FOUND)
-    target_link_libraries(GeoLib Qt5::Xml Qt5::XmlPatterns)
+    target_link_libraries(GeoLib PUBLIC Qt5::Xml Qt5::XmlPatterns)
     if(WIN32 AND CMAKE_CROSSCOMPILING AND OPENSSL_FOUND)
-        target_link_libraries(GeoLib Qt5::Network ${OPENSSL_LIBRARIES} ws2_32)
+        target_link_libraries(GeoLib PUBLIC Qt5::Network ${OPENSSL_LIBRARIES} ws2_32)
     endif()
 endif()
 

MaterialLib/CMakeLists.txt

@@ -21,7 +21,8 @@ append_source_files(SOURCES TwoPhaseModels)
 
 add_library(MaterialLib ${SOURCES})
 target_link_libraries(MaterialLib
-    BaseLib
+    PUBLIC BaseLib NumLib ProcessLib logog
+    PRIVATE MathLib MeshLib
 )
 
 if(OGS_USE_PCH)

MathLib/CMakeLists.txt

@@ -28,28 +28,26 @@ add_library(MathLib ${SOURCES})
 
 set_target_properties(MathLib PROPERTIES LINKER_LANGUAGE CXX)
 
-target_link_libraries(MathLib
-    BaseLib
-)
+target_link_libraries(MathLib PUBLIC BaseLib logog)
 
 if (CVODE_FOUND)
-    target_link_libraries(MathLib ${CVODE_LIBRARIES})
+    target_link_libraries(MathLib PUBLIC ${CVODE_LIBRARIES})
 endif()
 
 if(LAPACK_FOUND)
-    target_link_libraries(MathLib ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
+    target_link_libraries(MathLib PUBLIC ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
 endif()
 
 if (OGS_USE_LIS)
-    target_link_libraries(MathLib ${LIS_LIBRARIES})
+    target_link_libraries(MathLib PUBLIC ${LIS_LIBRARIES})
 endif()
 
 if (OGS_USE_MKL)
-    target_link_libraries(MathLib ${MKL_LIBRARIES})
+    target_link_libraries(MathLib PUBLIC ${MKL_LIBRARIES})
 endif()
 
 if (OGS_USE_PETSC)
-    target_link_libraries(MathLib ${PETSC_LIBRARIES})
+    target_link_libraries(MathLib PUBLIC ${PETSC_LIBRARIES})
 endif()
 
 if(TARGET Boost)

MeshGeoToolsLib/CMakeLists.txt

@@ -5,10 +5,8 @@ GET_SOURCE_FILES(SOURCES)
 add_library(MeshGeoToolsLib ${SOURCES})
 
 target_link_libraries(MeshGeoToolsLib
-    BaseLib
-    MathLib
-    MeshLib
-    GeoLib
+    PUBLIC GeoLib MathLib
+    PRIVATE BaseLib MeshLib logog
 )
 
 if(TARGET Boost)

MeshLib/CMakeLists.txt

@@ -27,7 +27,7 @@ if(OGS_USE_PCH)
 endif()
 
 target_link_libraries(MeshLib
-    PUBLIC BaseLib GeoLib MathLib
+    PUBLIC BaseLib GeoLib MathLib logog
     INTERFACE vtkIOXML
 )
 

NumLib/CMakeLists.txt

@@ -20,12 +20,8 @@ add_library(NumLib ${SOURCES})
 set_target_properties(NumLib PROPERTIES LINKER_LANGUAGE CXX)
 
 target_link_libraries(NumLib
-    BaseLib
-    GeoLib
-    MathLib
-    MeshLib
-    MeshGeoToolsLib
-    logog
+    PUBLIC BaseLib GeoLib MathLib MeshLib logog
+    PRIVATE MeshGeoToolsLib
 )
 
 if(TARGET Eigen)