diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index 44ad553443c5b9c243fbe8f53bcb88fe8eb8c866..cfd5b09be80480d394bc2f9c2ead789cfa9cebcb 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 505828929067dbb42da1fcbe1433e011170d07ee..be9561a9ebe6f5808d5da00be12dcf94c0d42ccf 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 b00d40311bccb26483986069989115bfa4ec3d4a..cf25d02d4b7c8f5fa0614842a94ce749dcc46139 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 4433234a96401bab0273a76e2d446bf05b0bd112..12f3b14a6fa83e6857d4a345a7c8c2d3dd9cb93c 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 e938f8672cbca4b134b8ff81a7c1fb6b3e0b2623..1c13bc9ef78c17dadae901d2fede06306de1a80b 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 a2ab9e8a7b2cd4b12e00b969a7165230f199257c..8052a991f9ae5ca454ebafd45602dd33bda8f0be 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 93a8bbe1fa9efc38b8b84d078ecc54931af600dc..aa1aaf77c6e314d39be18980fe68a72cd1895970 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 5fdc962570608b6131cc22d1d92128fe183692ab..c9283a1a82551465dae0a515c4048f8a858e8984 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 1c1052690a413c9d9d1c99161d027ddd4f6e381f..a0f55c5c55407440fd9bc206cb2ab74275d2bc27 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 c1fdad22e94c08048faf01eba30c259fab8d58f0..13bbef5c9113361e899cb7ca61685df7677f3a4e 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 a8832d49d3c8711e29d069346442d82efa03bdf5..9603ac9db5c161acc73977ba98bde54a2711e773 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 a0428cc05eaa083fb7f2e0257b6e085b76726c6e..26ec45f52fb3f900763fa074227449988e89ea8b 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 3755de89719561cf7681b92c0e478954a8b1e479..b64376b3e2a32916a6e0d89193874be34e6ec364 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 b7b08968667fb787ae3bad9d9ba88b6a60ac08d5..2eb34c3baf5b9025493601f89fa19d68b2a74631 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)