From 918ba477d245cacc8d1be8df68557b9cf0a0f7a9 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 16 Mar 2021 09:41:02 +0100
Subject: [PATCH] [cmake-format] Applications/* CMakeLists.txt
---
Applications/CLI/CMakeLists.txt | 63 +++++++++--------
Applications/DataExplorer/Base/CMakeLists.txt | 6 +-
.../DataExplorer/DataView/CMakeLists.txt | 70 ++++++++++---------
.../DataView/DiagramView/CMakeLists.txt | 28 ++++----
.../DataView/StratView/CMakeLists.txt | 19 +++--
.../DataExplorer/VtkVis/CMakeLists.txt | 55 ++++++++-------
Applications/DataHolderLib/CMakeLists.txt | 5 +-
Applications/FileIO/CMakeLists.txt | 43 +++++++-----
Applications/FileIO/GocadIO/CMakeLists.txt | 6 +-
Applications/InSituLib/CMakeLists.txt | 15 ++--
Applications/Utils/MeshEdit/CMakeLists.txt | 24 ++++---
.../Utils/OGSFileConverter/CMakeLists.txt | 24 ++++---
.../Utils/PostProcessing/CMakeLists.txt | 11 ++-
.../Utils/SWMMConverter/CMakeLists.txt | 15 ++--
14 files changed, 209 insertions(+), 175 deletions(-)
diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index b1031501bf2..44ad553443c 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -32,40 +32,41 @@ if(OGS_USE_PYTHON)
# provides the minimal set of parameters to ensure that the code using
# pybind11 compiles, but it does not pass these extra compiler flags (i.e.
# this is up to you). TODO: Enable further compiler/linker flags.
- target_link_libraries(ogs_embedded_python
- PUBLIC pybind11::embed
+ target_link_libraries(
+ ogs_embedded_python PUBLIC pybind11::embed
PRIVATE ProcessLibBoundaryConditionPythonModule
ProcessLibSourceTermPythonModule
)
- target_compile_definitions(ogs_embedded_python
+ target_compile_definitions(
+ ogs_embedded_python
PUBLIC OGS_USE_PYTHON
- # Add macro definition, because static libs make special handling
- # necessary s.t. the embedded OpenGeoSys Python module won't be removed
- # by the linker.
- $<$<BOOL:${BUILD_SHARED_LIBS}>:PRIVATE OGS_BUILD_SHARED_LIBS>
+ # Add macro definition, because static libs make special handling
+ # necessary s.t. the embedded OpenGeoSys Python module won't be
+ # removed by the linker.
+ $<$<BOOL:${BUILD_SHARED_LIBS}>:PRIVATE
+ OGS_BUILD_SHARED_LIBS>
)
endif()
add_executable(ogs ogs.cpp)
-target_link_libraries(ogs
- PRIVATE
- ApplicationsLib
- BaseLib
- CMakeInfoLib
- GitInfoLib
- MeshLib
- ProcessLib
- $<$<TARGET_EXISTS:ogs_embedded_python>:ogs_embedded_python>
- $<$<TARGET_EXISTS:MPI::MPI_CXX>:MPI::MPI_CXX>
- $<$<TARGET_EXISTS:InSituLib>:InSituLib>
- tclap
+target_link_libraries(
+ ogs
+ PRIVATE ApplicationsLib
+ BaseLib
+ CMakeInfoLib
+ GitInfoLib
+ MeshLib
+ ProcessLib
+ $<$<TARGET_EXISTS:ogs_embedded_python>:ogs_embedded_python>
+ $<$<TARGET_EXISTS:MPI::MPI_CXX>:MPI::MPI_CXX>
+ $<$<TARGET_EXISTS:InSituLib>:InSituLib>
+ tclap
)
-target_compile_definitions(ogs
- PRIVATE
- $<$<BOOL:${USE_INSITU}>:USE_INSITU>
- $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
+target_compile_definitions(
+ ogs PRIVATE $<$<BOOL:${USE_INSITU}>:USE_INSITU>
+ $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
)
# ---- Tests ----
@@ -76,11 +77,11 @@ set_tests_properties(ogs_no_args PROPERTIES WILL_FAIL TRUE)
install(TARGETS ogs RUNTIME DESTINATION bin)
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "ogs"
- "OGS Simulator")
-cpack_add_component(ogs_cli
- DISPLAY_NAME
- "OGS THMC Simulator"
- DESCRIPTION
- "The command line interface for OpenGeoSys."
- GROUP
- Applications)
+ "OGS Simulator"
+)
+cpack_add_component(
+ ogs_cli
+ DISPLAY_NAME "OGS THMC Simulator"
+ DESCRIPTION "The command line interface for OpenGeoSys."
+ GROUP Applications
+)
diff --git a/Applications/DataExplorer/Base/CMakeLists.txt b/Applications/DataExplorer/Base/CMakeLists.txt
index 6a0843fb91f..e11204cb5fc 100644
--- a/Applications/DataExplorer/Base/CMakeLists.txt
+++ b/Applications/DataExplorer/Base/CMakeLists.txt
@@ -8,7 +8,8 @@ set(SOURCES
ColorPickerPushButton.cpp
TreeModelIterator.cpp
CheckboxDelegate.cpp
- QValueTooltipSlider.cpp)
+ QValueTooltipSlider.cpp
+)
# Header files
set(HEADERS
@@ -22,7 +23,8 @@ set(HEADERS
TreeModel.h
ColorPickerPushButton.h
CheckboxDelegate.h
- QValueTooltipSlider.h)
+ QValueTooltipSlider.h
+)
# Put moc files in a project folder
source_group("UI Files" REGULAR_EXPRESSION "\\w*\\.ui")
diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index 865dfed0a03..0d528722995 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -42,7 +42,8 @@ set(SOURCES
StationTabWidget.cpp
StationTreeModel.cpp
StationTreeView.cpp
- SurfaceExtractionDialog.cpp)
+ SurfaceExtractionDialog.cpp
+)
set(HEADERS
AddLayerToMeshDialog.h
@@ -93,31 +94,38 @@ set(HEADERS
StationTabWidget.h
StationTreeModel.h
StationTreeView.h
- SurfaceExtractionDialog.h)
+ SurfaceExtractionDialog.h
+)
# Visual Studio folder
source_group("Dialog Header Files" REGULAR_EXPRESSION "[.]*Dialog.h")
source_group("Dialog Source Files" REGULAR_EXPRESSION "[.]*Dialog.cpp")
-source_group("Data Model Header Files" REGULAR_EXPRESSION
- "[.]*Item.h|[.]*Model.h|[.]*View.h")
-source_group("Data Model Source Files" REGULAR_EXPRESSION
- "[.]*Item.cpp|[.]*Model.cpp|[.]*View.cpp")
+source_group(
+ "Data Model Header Files"
+ REGULAR_EXPRESSION "[.]*Item.h|[.]*Model.h|[.]*View.h"
+)
+source_group(
+ "Data Model Source Files"
+ REGULAR_EXPRESSION "[.]*Item.cpp|[.]*Model.cpp|[.]*View.cpp"
+)
file(GLOB UIS CONFIGURE_DEPENDS *.ui)
source_group("UI Files" FILES ${UIS})
set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
-include_directories(${SOURCE_DIR_REL}/Applications/FileIO
- ${SOURCE_DIR_REL}/BaseLib
- ${SOURCE_DIR_REL}/MathLib
- ${SOURCE_DIR_REL}/GeoLib
- ${SOURCE_DIR_REL}/MeshGeoToolsLib
- ${SOURCE_DIR_REL}/MeshLib
- ${GUI_SOURCE_DIR_REL}/Base
- ${GUI_SOURCE_DIR_REL}/VtkVis
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/DiagramView
- ${CMAKE_CURRENT_SOURCE_DIR}/StratView)
+include_directories(
+ ${SOURCE_DIR_REL}/Applications/FileIO
+ ${SOURCE_DIR_REL}/BaseLib
+ ${SOURCE_DIR_REL}/MathLib
+ ${SOURCE_DIR_REL}/GeoLib
+ ${SOURCE_DIR_REL}/MeshGeoToolsLib
+ ${SOURCE_DIR_REL}/MeshLib
+ ${GUI_SOURCE_DIR_REL}/Base
+ ${GUI_SOURCE_DIR_REL}/VtkVis
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/DiagramView
+ ${CMAKE_CURRENT_SOURCE_DIR}/StratView
+)
if(GEOTIFF_FOUND)
include_directories(${GEOTIFF_INCLUDE_DIRS})
@@ -125,21 +133,19 @@ endif() # GEOTIFF_FOUND
ogs_add_library(QtDataView STATIC ${SOURCES} ${HEADERS} ${UIS})
-target_link_libraries(QtDataView
- PUBLIC GeoLib
- MeshGeoToolsLib
- MeshLib
- QtBase
- VtkVis
- PRIVATE BaseLib
- MathLib
- ApplicationsFileIO
- QtDiagramView
- QtStratView
- DataHolderLib
- spdlog::spdlog
- Qt5::Core
- Qt5::Gui)
+target_link_libraries(
+ QtDataView
+ PUBLIC GeoLib MeshGeoToolsLib MeshLib QtBase VtkVis
+ PRIVATE BaseLib
+ MathLib
+ ApplicationsFileIO
+ QtDiagramView
+ QtStratView
+ DataHolderLib
+ spdlog::spdlog
+ Qt5::Core
+ Qt5::Gui
+)
if(GEOTIFF_FOUND)
target_compile_definitions(QtDataView PRIVATE GEOTIFF_FOUND)
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index 72642618943..00f0cb959c4 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -5,7 +5,8 @@ set(SOURCES
DiagramScene.cpp
DiagramView.cpp
QArrow.cpp
- QGraphicsGrid.cpp)
+ QGraphicsGrid.cpp
+)
set(HEADERS
DiagramList.h
@@ -15,29 +16,26 @@ set(HEADERS
DiagramScene.h
DetailWindow.h
DiagramPrefsDialog.h
- DiagramView.h)
+ DiagramView.h
+)
set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-include_directories(${SOURCE_DIR_REL}/BaseLib
- ${SOURCE_DIR_REL}/GeoLib
- ${SOURCE_DIR_REL}/MathLib
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${GUI_SOURCE_DIR_REL}/Base
- ${GUI_SOURCE_DIR_REL}/DataView)
+include_directories(
+ ${SOURCE_DIR_REL}/BaseLib ${SOURCE_DIR_REL}/GeoLib
+ ${SOURCE_DIR_REL}/MathLib ${CMAKE_CURRENT_SOURCE_DIR}
+ ${GUI_SOURCE_DIR_REL}/Base ${GUI_SOURCE_DIR_REL}/DataView
+)
file(GLOB_RECURSE UIS CONFIGURE_DEPENDS *.ui)
source_group("UI Files" FILES ${UIS})
ogs_add_library(QtDiagramView ${SOURCES} ${HEADERS} ${UIS})
-target_link_libraries(QtDiagramView
- PRIVATE BaseLib
- GeoLib
- QtBase
- DataHolderLib
- Qt5::Gui
- spdlog::spdlog)
+target_link_libraries(
+ QtDiagramView PRIVATE BaseLib GeoLib QtBase DataHolderLib Qt5::Gui
+ spdlog::spdlog
+)
add_autogen_include(QtDiagramView)
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index 348af52b269..e7543b2cefb 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -4,23 +4,20 @@ set(HEADERS StratBar.h StratScene.h StratView.h StratWindow.h)
set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- ${SOURCE_DIR_REL}/BaseLib
- ${SOURCE_DIR_REL}/GeoLib
- ${SOURCE_DIR_REL}/MathLib
- ${GUI_SOURCE_DIR_REL}/Base)
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR} ${SOURCE_DIR_REL}/BaseLib
+ ${SOURCE_DIR_REL}/GeoLib ${SOURCE_DIR_REL}/MathLib
+ ${GUI_SOURCE_DIR_REL}/Base
+)
file(GLOB_RECURSE UI_FILES CONFIGURE_DEPENDS *.ui)
source_group("UI Files" FILES ${UI_FILES})
ogs_add_library(QtStratView ${SOURCES} ${HEADERS} ${UIS})
-target_link_libraries(QtStratView
- PRIVATE BaseLib
- GeoLib
- DataHolderLib
- QtBase
- Qt5::Gui)
+target_link_libraries(
+ QtStratView PRIVATE BaseLib GeoLib DataHolderLib QtBase Qt5::Gui
+)
add_autogen_include(QtStratView)
set_property(TARGET QtStratView PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index 7d7d42ad4d5..5fe7c6cd2ab 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -46,7 +46,8 @@ set(SOURCES
VtkVisPipelineItem.cpp
VtkVisPipelineView.cpp
VtkVisPointSetItem.cpp
- VtkVisTabWidget.cpp)
+ VtkVisTabWidget.cpp
+)
set(HEADERS
MeshFromRasterDialog.h
@@ -96,11 +97,12 @@ set(HEADERS
VtkVisPipelineItem.h
VtkVisPipelineView.h
VtkVisPointSetItem.h
- VtkVisTabWidget.h)
+ VtkVisTabWidget.h
+)
-set(UIS
- MeshFromRaster.ui VisPrefs.ui VisualizationWidgetBase.ui
- VtkAddFilterDialogBase.ui VtkVisTabWidgetBase.ui)
+set(UIS MeshFromRaster.ui VisPrefs.ui VisualizationWidgetBase.ui
+ VtkAddFilterDialogBase.ui VtkVisTabWidgetBase.ui
+)
if(OGS_USE_NETCDF)
set(SOURCES ${SOURCES} NetCdfConfigureDialog.h NetCdfConfigureDialog.cpp)
@@ -117,16 +119,18 @@ source_group("UI Files" FILES ${UIS})
set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
- ${SOURCE_DIR_REL}/Applications/FileIO
- ${SOURCE_DIR_REL}/BaseLib
- ${SOURCE_DIR_REL}/GeoLib
- ${SOURCE_DIR_REL}/MathLib
- ${SOURCE_DIR_REL}/MeshLib
- ${GUI_SOURCE_DIR_REL}/Base
- ${GUI_SOURCE_DIR_REL}/DataView
- ${GUI_SOURCE_DIR_REL}/VtkModules/Qt)
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${SOURCE_DIR_REL}/Applications/FileIO
+ ${SOURCE_DIR_REL}/BaseLib
+ ${SOURCE_DIR_REL}/GeoLib
+ ${SOURCE_DIR_REL}/MathLib
+ ${SOURCE_DIR_REL}/MeshLib
+ ${GUI_SOURCE_DIR_REL}/Base
+ ${GUI_SOURCE_DIR_REL}/DataView
+ ${GUI_SOURCE_DIR_REL}/VtkModules/Qt
+)
ogs_add_library(VtkVis STATIC ${SOURCES} ${HEADERS} ${UIS})
@@ -137,24 +141,23 @@ if(GEOTIFF_FOUND)
endif() # GEOTIFF_FOUND
target_link_libraries(
- VtkVis
- PUBLIC BaseLib GeoLib MeshLib DataHolderLib QtBase
- PRIVATE MathLib ApplicationsFileIO Qt5::Gui spdlog::spdlog)
+ VtkVis PUBLIC BaseLib GeoLib MeshLib DataHolderLib QtBase
+ PRIVATE MathLib ApplicationsFileIO Qt5::Gui spdlog::spdlog
+)
if(OGS_USE_NETCDF)
- target_link_libraries(VtkVis
- PUBLIC ${NETCDF_LIBRARIES_CXX}
- ${NETCDF_LIBRARIES_C}
- ${HDF5_HL_LIBRARIES}
- ${HDF5_LIBRARIES})
+ target_link_libraries(
+ VtkVis PUBLIC ${NETCDF_LIBRARIES_CXX} ${NETCDF_LIBRARIES_C}
+ ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES}
+ )
if(OGS_USE_CONAN AND MSVC)
target_link_libraries(VtkVis PUBLIC ${CONAN_LIBS})
endif()
# Workaround for system installed VTK (tested on arch)
if(NOT OGS_USE_CONAN)
- target_include_directories(VtkVis SYSTEM
- PUBLIC ${NETCDF_INCLUDES_C}
- ${NETCDF_INCLUDES_CXX})
+ target_include_directories(
+ VtkVis SYSTEM PUBLIC ${NETCDF_INCLUDES_C} ${NETCDF_INCLUDES_CXX}
+ )
endif()
endif()
diff --git a/Applications/DataHolderLib/CMakeLists.txt b/Applications/DataHolderLib/CMakeLists.txt
index 89f3f0303f6..a902c9c8d35 100644
--- a/Applications/DataHolderLib/CMakeLists.txt
+++ b/Applications/DataHolderLib/CMakeLists.txt
@@ -5,6 +5,5 @@ get_source_files(SOURCES_DataHolderLib)
ogs_add_library(DataHolderLib ${SOURCES_DataHolderLib})
target_link_libraries(
- DataHolderLib
- PUBLIC GeoLib MeshLib
- PRIVATE BaseLib MathLib spdlog::spdlog)
+ DataHolderLib PUBLIC GeoLib MeshLib PRIVATE BaseLib MathLib spdlog::spdlog
+)
diff --git a/Applications/FileIO/CMakeLists.txt b/Applications/FileIO/CMakeLists.txt
index 43724175141..1c1b53a7927 100644
--- a/Applications/FileIO/CMakeLists.txt
+++ b/Applications/FileIO/CMakeLists.txt
@@ -22,24 +22,31 @@ endif()
# Create the library
ogs_add_library(ApplicationsFileIO ${SOURCES})
-target_link_libraries(ApplicationsFileIO
- PUBLIC BaseLib
- DataHolderLib
- GeoLib
- MathLib
- # Needed for the XmlPrjInterface, which links the DE/Base/OGSError.h.
- $<$<BOOL:${OGS_BUILD_GUI}>:QtBase>
- $<$<TARGET_EXISTS:shp>:shp>
- $<$<TARGET_EXISTS:SwmmInterface>:SwmmInterface>
- PRIVATE MeshLib GitInfoLib std::filesystem spdlog::spdlog
+target_link_libraries(
+ ApplicationsFileIO
+ PUBLIC BaseLib
+ DataHolderLib
+ GeoLib
+ MathLib
+ # Needed for the XmlPrjInterface, which links the DE/Base/OGSError.h.
+ $<$<BOOL:${OGS_BUILD_GUI}>:QtBase>
+ $<$<TARGET_EXISTS:shp>:shp>
+ $<$<TARGET_EXISTS:SwmmInterface>:SwmmInterface>
+ PRIVATE MeshLib GitInfoLib std::filesystem spdlog::spdlog
)
-configure_file(XmlIO/OpenGeoSysCND.xsd
- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysCND.xsd COPYONLY)
-configure_file(XmlIO/OpenGeoSysNum.xsd
- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysNum.xsd COPYONLY)
-configure_file(XmlIO/OpenGeoSysProject.xsd
- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysProject.xsd COPYONLY)
+configure_file(
+ XmlIO/OpenGeoSysCND.xsd ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysCND.xsd
+ COPYONLY
+)
+configure_file(
+ XmlIO/OpenGeoSysNum.xsd ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysNum.xsd
+ COPYONLY
+)
+configure_file(
+ XmlIO/OpenGeoSysProject.xsd
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysProject.xsd COPYONLY
+)
install(FILES XmlIO/OpenGeoSysCND.xsd XmlIO/OpenGeoSysNum.xsd
- XmlIO/OpenGeoSysProject.xsd
- DESTINATION bin)
+ XmlIO/OpenGeoSysProject.xsd DESTINATION bin
+)
diff --git a/Applications/FileIO/GocadIO/CMakeLists.txt b/Applications/FileIO/GocadIO/CMakeLists.txt
index a5d9d3df2e5..82f8dd1bce4 100644
--- a/Applications/FileIO/GocadIO/CMakeLists.txt
+++ b/Applications/FileIO/GocadIO/CMakeLists.txt
@@ -1,2 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR}/BaseLib ${CMAKE_SOURCE_DIR}/FileIO
- ${CMAKE_SOURCE_DIR}/GeoLib ${CMAKE_SOURCE_DIR}/MeshLib)
+include_directories(
+ ${CMAKE_SOURCE_DIR}/BaseLib ${CMAKE_SOURCE_DIR}/FileIO
+ ${CMAKE_SOURCE_DIR}/GeoLib ${CMAKE_SOURCE_DIR}/MeshLib
+)
diff --git a/Applications/InSituLib/CMakeLists.txt b/Applications/InSituLib/CMakeLists.txt
index e42084487e2..788fb02ddd9 100644
--- a/Applications/InSituLib/CMakeLists.txt
+++ b/Applications/InSituLib/CMakeLists.txt
@@ -7,12 +7,9 @@ if(BUILD_SHARED_LIBS)
install(TARGETS InSituLib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
-target_link_libraries(InSituLib
- PUBLIC
- BaseLib
- INTERFACE
- VTK::PythonUsed
- PRIVATE
- MeshLib
- ParaView::PythonCatalyst
- VTK::CommonDataModel)
+target_link_libraries(
+ InSituLib
+ PUBLIC BaseLib
+ INTERFACE VTK::PythonUsed
+ PRIVATE MeshLib ParaView::PythonCatalyst VTK::CommonDataModel
+)
diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt
index ae507cab6c9..3f5fb924745 100644
--- a/Applications/Utils/MeshEdit/CMakeLists.txt
+++ b/Applications/Utils/MeshEdit/CMakeLists.txt
@@ -22,14 +22,18 @@ set(TOOLS
ResetPropertiesInPolygonalRegion
reviseMesh
swapNodeCoordinateAxes
- Vtu2Grid)
+ Vtu2Grid
+)
if(OGS_BUILD_GUI)
- add_executable(RemoveGhostData
+ add_executable(
+ RemoveGhostData
RemoveGhostData.cpp
- ${PROJECT_SOURCE_DIR}/ThirdParty/paraview/vtkCleanUnstructuredGrid.cpp)
- target_include_directories(RemoveGhostData
- PRIVATE ${PROJECT_SOURCE_DIR}/ThirdParty/paraview)
+ ${PROJECT_SOURCE_DIR}/ThirdParty/paraview/vtkCleanUnstructuredGrid.cpp
+ )
+ target_include_directories(
+ RemoveGhostData PRIVATE ${PROJECT_SOURCE_DIR}/ThirdParty/paraview
+ )
target_link_libraries(RemoveGhostData GitInfoLib MeshLib tclap)
set_target_properties(RemoveGhostData PROPERTIES FOLDER Utilities)
install(TARGETS RemoveGhostData RUNTIME DESTINATION bin)
@@ -42,10 +46,12 @@ endforeach()
set_target_properties(${TOOLS} PROPERTIES FOLDER Utilities)
install(TARGETS ${TOOLS} RUNTIME DESTINATION bin)
-target_link_libraries(appendLinesAlongPolyline MeshGeoToolsLib
- ApplicationsFileIO)
-target_link_libraries(CreateBoundaryConditionsAlongPolylines MeshGeoToolsLib
- ApplicationsFileIO)
+target_link_libraries(
+ appendLinesAlongPolyline MeshGeoToolsLib ApplicationsFileIO
+)
+target_link_libraries(
+ CreateBoundaryConditionsAlongPolylines MeshGeoToolsLib ApplicationsFileIO
+)
target_link_libraries(createLayeredMeshFromRasters ApplicationsFileIO)
target_link_libraries(MapGeometryToMeshSurface MeshGeoToolsLib)
target_link_libraries(ResetPropertiesInPolygonalRegion ApplicationsFileIO)
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 20eac9d48b0..f1ab01bbc1e 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -1,19 +1,25 @@
-ogs_add_library(OGSFileConverterLib FileListDialog.h OGSFileConverter.h
- FileListDialog.cpp OGSFileConverter.cpp)
-target_link_libraries(OGSFileConverterLib
- PUBLIC ApplicationsFileIO MathLib QtBase ${VTK_LIBRARIES}
- INTERFACE MeshLib)
+ogs_add_library(
+ OGSFileConverterLib FileListDialog.h OGSFileConverter.h FileListDialog.cpp
+ OGSFileConverter.cpp
+)
+target_link_libraries(
+ OGSFileConverterLib PUBLIC ApplicationsFileIO MathLib QtBase
+ ${VTK_LIBRARIES} INTERFACE MeshLib
+)
set_target_properties(OGSFileConverterLib PROPERTIES AUTOMOC TRUE AUTOUIC TRUE)
add_executable(OGSFileConverter main.cpp)
-target_link_libraries(OGSFileConverter
- PUBLIC ApplicationsFileIO GitInfoLib OGSFileConverterLib tclap)
+target_link_libraries(
+ OGSFileConverter PUBLIC ApplicationsFileIO GitInfoLib OGSFileConverterLib
+ tclap
+)
add_autogen_include(OGSFileConverterLib)
-set_target_properties(OGSFileConverter OGSFileConverterLib
- PROPERTIES FOLDER "Utilities")
+set_target_properties(
+ OGSFileConverter OGSFileConverterLib PROPERTIES FOLDER "Utilities"
+)
install(TARGETS OGSFileConverter RUNTIME DESTINATION bin)
diff --git a/Applications/Utils/PostProcessing/CMakeLists.txt b/Applications/Utils/PostProcessing/CMakeLists.txt
index c3bd2f990e0..0a10a65b9c8 100644
--- a/Applications/Utils/PostProcessing/CMakeLists.txt
+++ b/Applications/Utils/PostProcessing/CMakeLists.txt
@@ -7,7 +7,16 @@ endif()
if(OGS_BUILD_GUI)
add_executable(Raster2PointCloud Raster2PointCloud.cpp)
- target_link_libraries(Raster2PointCloud GitInfoLib ApplicationsFileIO BaseLib GeoLib VtkVis QtDataView tclap)
+ target_link_libraries(
+ Raster2PointCloud
+ GitInfoLib
+ ApplicationsFileIO
+ BaseLib
+ GeoLib
+ VtkVis
+ QtDataView
+ tclap
+ )
set_target_properties(Raster2PointCloud PROPERTIES FOLDER Utilities)
install(TARGETS Raster2PointCloud RUNTIME DESTINATION bin)
endif()
diff --git a/Applications/Utils/SWMMConverter/CMakeLists.txt b/Applications/Utils/SWMMConverter/CMakeLists.txt
index 1d03b716ace..ebdc0309413 100644
--- a/Applications/Utils/SWMMConverter/CMakeLists.txt
+++ b/Applications/Utils/SWMMConverter/CMakeLists.txt
@@ -1,11 +1,12 @@
add_executable(SWMMConverter SWMMConverter.cpp)
-target_link_libraries(SWMMConverter
- ApplicationsFileIO
- GeoLib
- GitInfoLib
- MeshLib
- SwmmInterface
- tclap
+target_link_libraries(
+ SWMMConverter
+ ApplicationsFileIO
+ GeoLib
+ GitInfoLib
+ MeshLib
+ SwmmInterface
+ tclap
)
include_directories(${PROJECT_SOURCE_DIR}/Applications/FileIO)
set_target_properties(SWMMConverter PROPERTIES FOLDER Utilities)
--
GitLab