From 4e95dc5c7f71d678767603c27a1f36e03a60c506 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 15 Apr 2021 16:28:36 +0200
Subject: [PATCH] [cmake] Use ogs_add_executable().
---
Applications/CLI/CMakeLists.txt | 2 +-
Applications/DataExplorer/DataExplorer.cmake | 8 ++++++--
Applications/Utils/FileConverter/CMakeLists.txt | 2 +-
Applications/Utils/GeoTools/CMakeLists.txt | 2 +-
Applications/Utils/MeshEdit/CMakeLists.txt | 7 +++----
Applications/Utils/MeshGeoTools/CMakeLists.txt | 2 +-
Applications/Utils/ModelPreparation/CMakeLists.txt | 2 +-
.../Utils/ModelPreparation/PartitionMesh/CMakeLists.txt | 4 +++-
Applications/Utils/OGSFileConverter/CMakeLists.txt | 2 +-
Applications/Utils/PostProcessing/CMakeLists.txt | 4 ++--
Applications/Utils/SWMMConverter/CMakeLists.txt | 2 +-
Applications/Utils/SimpleMeshCreation/CMakeLists.txt | 2 +-
Tests/CMakeLists.txt | 2 +-
Tests/xdmfdiff/CMakeLists.txt | 2 +-
14 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index 44ad553443c..cfd5b09be80 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -48,7 +48,7 @@ if(OGS_USE_PYTHON)
)
endif()
-add_executable(ogs ogs.cpp)
+ogs_add_executable(ogs ogs.cpp)
target_link_libraries(
ogs
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 50582892906..be9561a9ebe 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -21,8 +21,12 @@ source_group("UI Files" FILES ${UIS})
set(APP_ICON ${SOURCE_DIR_REL}/scripts/packaging/ogs-de-icon.icns)
# Create the executable
-add_executable(DataExplorer main.cpp ${SOURCES} ${UIS} ${APP_ICON} exe-icon.rc)
-target_compile_definitions(DataExplorer PUBLIC $<$<BOOL:${VTK_ADDED}>:VTK_VIA_CPM>)
+ogs_add_executable(
+ DataExplorer main.cpp ${SOURCES} ${UIS} ${APP_ICON} exe-icon.rc
+)
+target_compile_definitions(
+ DataExplorer PUBLIC $<$<BOOL:${VTK_ADDED}>:VTK_VIA_CPM>
+)
target_link_libraries(
DataExplorer
diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt
index b00d40311bc..cf25d02d4b7 100644
--- a/Applications/Utils/FileConverter/CMakeLists.txt
+++ b/Applications/Utils/FileConverter/CMakeLists.txt
@@ -21,7 +21,7 @@ if(OGS_BUILD_GUI)
endif()
foreach(tool ${TOOLS})
- add_executable(${tool} ${tool}.cpp)
+ ogs_add_executable(${tool} ${tool}.cpp)
target_link_libraries(
${tool} ApplicationsFileIO GitInfoLib MeshLib MeshGeoToolsLib tclap
)
diff --git a/Applications/Utils/GeoTools/CMakeLists.txt b/Applications/Utils/GeoTools/CMakeLists.txt
index 4433234a964..12f3b14a6fa 100644
--- a/Applications/Utils/GeoTools/CMakeLists.txt
+++ b/Applications/Utils/GeoTools/CMakeLists.txt
@@ -4,7 +4,7 @@ endif()
set(TOOLS MoveGeometry TriangulatePolyline)
foreach(tool ${TOOLS})
- add_executable(${tool} ${tool}.cpp)
+ ogs_add_executable(${tool} ${tool}.cpp)
target_link_libraries(
${tool} GeoLib GitInfoLib ApplicationsFileIO tclap Qt5::Core
)
diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt
index e938f8672cb..1c13bc9ef78 100644
--- a/Applications/Utils/MeshEdit/CMakeLists.txt
+++ b/Applications/Utils/MeshEdit/CMakeLists.txt
@@ -26,9 +26,8 @@ set(TOOLS
)
if(OGS_BUILD_GUI)
- add_executable(
- RemoveGhostData
- RemoveGhostData.cpp
+ ogs_add_executable(
+ RemoveGhostData RemoveGhostData.cpp
${PROJECT_SOURCE_DIR}/ThirdParty/paraview/vtkCleanUnstructuredGrid.cpp
)
target_include_directories(
@@ -39,7 +38,7 @@ if(OGS_BUILD_GUI)
endif()
foreach(tool ${TOOLS})
- add_executable(${tool} ${tool}.cpp)
+ ogs_add_executable(${tool} ${tool}.cpp)
target_link_libraries(${tool} GitInfoLib MeshLib tclap)
endforeach()
install(TARGETS ${TOOLS} RUNTIME DESTINATION bin)
diff --git a/Applications/Utils/MeshGeoTools/CMakeLists.txt b/Applications/Utils/MeshGeoTools/CMakeLists.txt
index a2ab9e8a7b2..8052a991f9a 100644
--- a/Applications/Utils/MeshGeoTools/CMakeLists.txt
+++ b/Applications/Utils/MeshGeoTools/CMakeLists.txt
@@ -15,7 +15,7 @@ if(OGS_BUILD_GUI)
endif()
foreach(tool ${TOOLS})
- add_executable(${tool} ${tool}.cpp)
+ ogs_add_executable(${tool} ${tool}.cpp)
target_link_libraries(
${tool} ApplicationsFileIO GitInfoLib MeshLib MeshGeoToolsLib tclap
)
diff --git a/Applications/Utils/ModelPreparation/CMakeLists.txt b/Applications/Utils/ModelPreparation/CMakeLists.txt
index 93a8bbe1fa9..aa1aaf77c6e 100644
--- a/Applications/Utils/ModelPreparation/CMakeLists.txt
+++ b/Applications/Utils/ModelPreparation/CMakeLists.txt
@@ -2,7 +2,7 @@ set(TOOLS ComputeNodeAreasFromSurfaceMesh convertVtkDataArrayToVtkDataArray
createNeumannBc scaleProperty
)
foreach(tool ${TOOLS})
- add_executable(${tool} ${tool}.cpp)
+ ogs_add_executable(${tool} ${tool}.cpp)
target_link_libraries(${tool} GitInfoLib MeshLib tclap)
endforeach()
install(TARGETS ${TOOLS} RUNTIME DESTINATION bin)
diff --git a/Applications/Utils/ModelPreparation/PartitionMesh/CMakeLists.txt b/Applications/Utils/ModelPreparation/PartitionMesh/CMakeLists.txt
index 5fdc9625706..c9283a1a825 100644
--- a/Applications/Utils/ModelPreparation/PartitionMesh/CMakeLists.txt
+++ b/Applications/Utils/ModelPreparation/PartitionMesh/CMakeLists.txt
@@ -6,7 +6,9 @@ CPMAddPackage(
)
include(${PROJECT_SOURCE_DIR}/scripts/cmake/MetisSetup.cmake)
-add_executable(partmesh PartitionMesh.cpp Metis.cpp NodeWiseMeshPartitioner.cpp)
+ogs_add_executable(
+ partmesh PartitionMesh.cpp Metis.cpp NodeWiseMeshPartitioner.cpp
+)
target_link_libraries(partmesh GitInfoLib MeshLib tclap)
add_dependencies(partmesh mpmetis)
install(TARGETS partmesh RUNTIME DESTINATION bin)
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 1c1052690a4..a0f55c5c554 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -9,7 +9,7 @@ target_link_libraries(
set_target_properties(OGSFileConverterLib PROPERTIES AUTOMOC TRUE AUTOUIC TRUE)
-add_executable(OGSFileConverter main.cpp)
+ogs_add_executable(OGSFileConverter main.cpp)
target_link_libraries(
OGSFileConverter PUBLIC ApplicationsFileIO GitInfoLib OGSFileConverterLib
diff --git a/Applications/Utils/PostProcessing/CMakeLists.txt b/Applications/Utils/PostProcessing/CMakeLists.txt
index c1fdad22e94..13bbef5c911 100644
--- a/Applications/Utils/PostProcessing/CMakeLists.txt
+++ b/Applications/Utils/PostProcessing/CMakeLists.txt
@@ -1,11 +1,11 @@
if(OGS_BUILD_PROCESS_LIE)
- add_executable(postLIE postLIE.cpp)
+ ogs_add_executable(postLIE postLIE.cpp)
target_link_libraries(postLIE GitInfoLib LIECommon tclap)
install(TARGETS postLIE RUNTIME DESTINATION bin)
endif()
if(OGS_BUILD_GUI)
- add_executable(Raster2PointCloud Raster2PointCloud.cpp)
+ ogs_add_executable(Raster2PointCloud Raster2PointCloud.cpp)
target_link_libraries(
Raster2PointCloud ApplicationsFileIO BaseLib GitInfoLib tclap
VtkVisFilter
diff --git a/Applications/Utils/SWMMConverter/CMakeLists.txt b/Applications/Utils/SWMMConverter/CMakeLists.txt
index a8832d49d3c..9603ac9db5c 100644
--- a/Applications/Utils/SWMMConverter/CMakeLists.txt
+++ b/Applications/Utils/SWMMConverter/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_executable(SWMMConverter SWMMConverter.cpp)
+ogs_add_executable(SWMMConverter SWMMConverter.cpp)
target_link_libraries(
SWMMConverter
ApplicationsFileIO
diff --git a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
index a0428cc05ea..26ec45f52fb 100644
--- a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
+++ b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
@@ -4,7 +4,7 @@ if(OGS_BUILD_GUI)
endif()
foreach(tool ${TOOLS})
- add_executable(${tool} ${tool}.cpp)
+ ogs_add_executable(${tool} ${tool}.cpp)
target_link_libraries(${tool} ApplicationsFileIO GitInfoLib MeshLib tclap)
endforeach()
install(TARGETS ${TOOLS} RUNTIME DESTINATION bin)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3755de89719..b64376b3e2a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -54,7 +54,7 @@ if(OGS_USE_PETSC)
list(REMOVE_ITEM TEST_SOURCES NumLib/TestSerialLinearSolver.cpp)
endif()
-add_executable(testrunner ${TEST_SOURCES})
+ogs_add_executable(testrunner ${TEST_SOURCES})
target_link_libraries(
testrunner
diff --git a/Tests/xdmfdiff/CMakeLists.txt b/Tests/xdmfdiff/CMakeLists.txt
index b7b08968667..2eb34c3baf5 100644
--- a/Tests/xdmfdiff/CMakeLists.txt
+++ b/Tests/xdmfdiff/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_executable(xdmfdiff xdmfdiff.cpp)
+ogs_add_executable(xdmfdiff xdmfdiff.cpp)
target_link_libraries(xdmfdiff OgsXdmf GitInfoLib std::filesystem tclap)
install(PROGRAMS $<TARGET_FILE:xdmfdiff> DESTINATION bin)
--
GitLab