From 11b504a6e79f345e12af4e17fc5b15d46ee04b3b Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Mon, 22 May 2023 11:28:44 +0200
Subject: [PATCH] [CMake] Link the new mesh related lib to the associated libs
---
Applications/ApplicationsLib/CMakeLists.txt | 2 +-
Applications/FileIO/CMakeLists.txt | 2 +-
Applications/Utils/FileConverter/CMakeLists.txt | 3 ++-
Applications/Utils/GeoTools/CMakeLists.txt | 2 +-
Applications/Utils/MeshEdit/CMakeLists.txt | 5 +++--
Applications/Utils/MeshGeoTools/CMakeLists.txt | 2 +-
Applications/Utils/ModelPreparation/CMakeLists.txt | 2 +-
Applications/Utils/OGSFileConverter/CMakeLists.txt | 2 +-
Applications/Utils/PostProcessing/CMakeLists.txt | 4 ++--
Applications/Utils/SimpleMeshCreation/CMakeLists.txt | 3 ++-
CMakeLists.txt | 1 +
MeshGeoToolsLib/CMakeLists.txt | 2 +-
Tests/CMakeLists.txt | 1 +
13 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/Applications/ApplicationsLib/CMakeLists.txt b/Applications/ApplicationsLib/CMakeLists.txt
index 6a49327875f..86eb64722bd 100644
--- a/Applications/ApplicationsLib/CMakeLists.txt
+++ b/Applications/ApplicationsLib/CMakeLists.txt
@@ -18,7 +18,7 @@ if(OGS_BUILD_CLI OR OGS_BUILD_UTILS OR OGS_BUILD_TESTING)
ApplicationsLib PUBLIC Processes PRIVATE ParameterLib ProcessLib
)
elseif(OGS_BUILD_GUI)
- target_link_libraries(ApplicationsLib PRIVATE nlohmann_json::nlohmann_json)
+ target_link_libraries(ApplicationsLib PRIVATE MeshToolsLib nlohmann_json::nlohmann_json)
endif()
if(OGS_USE_LIS)
diff --git a/Applications/FileIO/CMakeLists.txt b/Applications/FileIO/CMakeLists.txt
index e3819bbfd4b..fc14b9dfd9f 100644
--- a/Applications/FileIO/CMakeLists.txt
+++ b/Applications/FileIO/CMakeLists.txt
@@ -32,7 +32,7 @@ target_link_libraries(
$<$<BOOL:${OGS_BUILD_GUI}>:QtBase>
$<$<TARGET_EXISTS:shp>:shp>
$<$<TARGET_EXISTS:SwmmInterface>:SwmmInterface>
- PRIVATE MeshLib GitInfoLib
+ PRIVATE MeshLib MeshToolsLib GitInfoLib
)
target_precompile_headers(ApplicationsFileIO PRIVATE [["BaseLib/Error.h"]]
diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt
index b35e3f3f3ed..1050fcbe834 100644
--- a/Applications/Utils/FileConverter/CMakeLists.txt
+++ b/Applications/Utils/FileConverter/CMakeLists.txt
@@ -25,7 +25,8 @@ endif()
foreach(tool ${TOOLS})
ogs_add_executable(${tool} ${tool}.cpp)
target_link_libraries(
- ${tool} ApplicationsFileIO GitInfoLib MeshLib MeshGeoToolsLib tclap
+ ${tool} ApplicationsFileIO GitInfoLib MeshLib
+ MeshToolsLib MeshGeoToolsLib tclap
)
endforeach()
install(TARGETS ${TOOLS} RUNTIME DESTINATION bin)
diff --git a/Applications/Utils/GeoTools/CMakeLists.txt b/Applications/Utils/GeoTools/CMakeLists.txt
index 4ff8b39fa7f..d13d64a86a3 100644
--- a/Applications/Utils/GeoTools/CMakeLists.txt
+++ b/Applications/Utils/GeoTools/CMakeLists.txt
@@ -2,7 +2,7 @@ set(TOOLS MoveGeometry createRaster addDataToRaster generateGeometry)
foreach(tool ${TOOLS})
ogs_add_executable(${tool} ${tool}.cpp)
target_link_libraries(
- ${tool} GeoLib GitInfoLib ApplicationsFileIO tclap
+ ${tool} GeoLib GitInfoLib ApplicationsFileIO MeshToolsLib tclap
)
endforeach()
install(TARGETS ${TOOLS} RUNTIME DESTINATION bin)
diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt
index 419689ff98e..b14178dbfc2 100644
--- a/Applications/Utils/MeshEdit/CMakeLists.txt
+++ b/Applications/Utils/MeshEdit/CMakeLists.txt
@@ -37,13 +37,13 @@ target_include_directories(
RemoveGhostData PRIVATE ${PROJECT_SOURCE_DIR}/ThirdParty/paraview
)
target_link_libraries(
- RemoveGhostData GitInfoLib MeshLib tclap VTK::FiltersParallel
+ RemoveGhostData GitInfoLib MeshLib MeshToolsLib tclap VTK::FiltersParallel
)
install(TARGETS RemoveGhostData RUNTIME DESTINATION bin)
foreach(tool ${TOOLS})
ogs_add_executable(${tool} ${tool}.cpp)
- target_link_libraries(${tool} GitInfoLib MeshLib tclap)
+ target_link_libraries(${tool} GitInfoLib MeshLib MeshToolsLib tclap)
endforeach()
install(TARGETS ${TOOLS} RUNTIME DESTINATION bin)
@@ -53,6 +53,7 @@ target_link_libraries(
target_link_libraries(
CreateBoundaryConditionsAlongPolylines MeshGeoToolsLib ApplicationsFileIO
)
+
target_link_libraries(createLayeredMeshFromRasters ApplicationsFileIO)
target_link_libraries(MapGeometryToMeshSurface MeshGeoToolsLib)
target_link_libraries(MeshMapping ApplicationsFileIO)
diff --git a/Applications/Utils/MeshGeoTools/CMakeLists.txt b/Applications/Utils/MeshGeoTools/CMakeLists.txt
index de10ebe24ec..1f22b261f7a 100644
--- a/Applications/Utils/MeshGeoTools/CMakeLists.txt
+++ b/Applications/Utils/MeshGeoTools/CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
foreach(tool ${TOOLS})
ogs_add_executable(${tool} ${tool}.cpp)
target_link_libraries(
- ${tool} ApplicationsFileIO GitInfoLib MeshLib MeshGeoToolsLib tclap
+ ${tool} ApplicationsFileIO GitInfoLib MeshLib MeshToolsLib MeshGeoToolsLib tclap
)
endforeach()
diff --git a/Applications/Utils/ModelPreparation/CMakeLists.txt b/Applications/Utils/ModelPreparation/CMakeLists.txt
index 8536e16a724..566e30fdcee 100644
--- a/Applications/Utils/ModelPreparation/CMakeLists.txt
+++ b/Applications/Utils/ModelPreparation/CMakeLists.txt
@@ -5,6 +5,6 @@ set(TOOLS ComputeNodeAreasFromSurfaceMesh convertVtkDataArrayToVtkDataArray
)
foreach(tool ${TOOLS})
ogs_add_executable(${tool} ${tool}.cpp)
- target_link_libraries(${tool} GitInfoLib MeshLib tclap)
+ target_link_libraries(${tool} GitInfoLib MeshLib MeshToolsLib tclap)
endforeach()
install(TARGETS ${TOOLS} RUNTIME DESTINATION bin)
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 640abb9fa49..caa479b8817 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -4,7 +4,7 @@ ogs_add_library(
)
target_link_libraries(
OGSFileConverterLib PUBLIC ApplicationsFileIO MathLib QtBase
- INTERFACE MeshLib
+ INTERFACE MeshLib MeshToolsLib
)
set_target_properties(OGSFileConverterLib PROPERTIES AUTOMOC TRUE AUTOUIC TRUE)
diff --git a/Applications/Utils/PostProcessing/CMakeLists.txt b/Applications/Utils/PostProcessing/CMakeLists.txt
index 13bbef5c911..71ac52621b1 100644
--- a/Applications/Utils/PostProcessing/CMakeLists.txt
+++ b/Applications/Utils/PostProcessing/CMakeLists.txt
@@ -1,13 +1,13 @@
if(OGS_BUILD_PROCESS_LIE)
ogs_add_executable(postLIE postLIE.cpp)
- target_link_libraries(postLIE GitInfoLib LIECommon tclap)
+ target_link_libraries(postLIE GitInfoLib LIECommon MeshToolsLib tclap)
install(TARGETS postLIE RUNTIME DESTINATION bin)
endif()
if(OGS_BUILD_GUI)
ogs_add_executable(Raster2PointCloud Raster2PointCloud.cpp)
target_link_libraries(
- Raster2PointCloud ApplicationsFileIO BaseLib GitInfoLib tclap
+ Raster2PointCloud ApplicationsFileIO BaseLib MeshToolsLib GitInfoLib tclap
VtkVisFilter
)
install(TARGETS Raster2PointCloud RUNTIME DESTINATION bin)
diff --git a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
index 0bb8da606c6..9e01789cf84 100644
--- a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
+++ b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
@@ -2,6 +2,7 @@ set(TOOLS generateStructuredMesh createMeshElemPropertiesFromASCRaster)
foreach(tool ${TOOLS})
ogs_add_executable(${tool} ${tool}.cpp)
- target_link_libraries(${tool} ApplicationsFileIO GitInfoLib MeshLib tclap)
+ target_link_libraries(${tool} ApplicationsFileIO GitInfoLib MeshLib
+ MeshToolsLib tclap)
endforeach()
install(TARGETS ${TOOLS} RUNTIME DESTINATION bin)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 756fe96aa49..40bb8853699 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,6 +221,7 @@ add_subdirectory(GeoLib)
add_subdirectory(InfoLib)
add_subdirectory(MathLib)
add_subdirectory(MeshLib)
+add_subdirectory(MeshToolsLib)
add_subdirectory(MeshGeoToolsLib)
add_subdirectory(NumLib)
diff --git a/MeshGeoToolsLib/CMakeLists.txt b/MeshGeoToolsLib/CMakeLists.txt
index d8670feacc4..0e165b8efff 100644
--- a/MeshGeoToolsLib/CMakeLists.txt
+++ b/MeshGeoToolsLib/CMakeLists.txt
@@ -5,7 +5,7 @@ get_source_files(SOURCES)
ogs_add_library(MeshGeoToolsLib ${SOURCES})
target_link_libraries(
- MeshGeoToolsLib PUBLIC GeoLib MathLib PRIVATE BaseLib MeshLib
+ MeshGeoToolsLib PUBLIC GeoLib MathLib PRIVATE BaseLib MeshToolsLib
)
target_precompile_headers(MeshGeoToolsLib PRIVATE [["BaseLib/Error.h"]]
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1231b018b6c..3dbcdfaa98e 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -88,6 +88,7 @@ target_link_libraries(
autocheck
gmock
gtest
+ MeshToolsLib
MeshGeoToolsLib
MaterialLib
MathLib
--
GitLab