Merge branch 'fix-linking-gui-tools' into 'master'

Fix linking gui tools

See merge request ogs/ogs!3558

Applications/DataExplorer/DataView/CMakeLists.txt

@@ -131,7 +131,7 @@ if(GEOTIFF_FOUND)
     include_directories(${GEOTIFF_INCLUDE_DIRS})
 endif() # GEOTIFF_FOUND
 
-ogs_add_library(QtDataView STATIC ${SOURCES} ${HEADERS} ${UIS})
+ogs_add_library(QtDataView ${SOURCES} ${HEADERS} ${UIS})
 
 target_link_libraries(
     QtDataView

Applications/DataExplorer/VtkVis/CMakeLists.txt

-set(SOURCES
-    MeshFromRasterDialog.cpp
-    QVtkDataSetMapper.cpp
-    VisPrefsDialog.cpp
-    VisualizationWidget.cpp
-    VtkAddFilterDialog.cpp
+# ---- VtkVisFilter ----
+set(FILTER_SOURCES
     VtkAlgorithmProperties.cpp
-    VtkAlgorithmPropertyCheckbox.cpp
-    VtkAlgorithmPropertyLineEdit.cpp
-    VtkAlgorithmPropertyVectorEdit.cpp
     VtkAppendArrayFilter.cpp
     VtkBGImageSource.cpp
     VtkColorByHeightFilter.cpp
     VtkColorLookupTable.cpp
-    VtkCompositeFilter.cpp
     VtkCompositeColorByHeightFilter.cpp
     VtkCompositeColormapToImageFilter.cpp
     VtkCompositeContourFilter.cpp
     VtkCompositeElementSelectionFilter.cpp
+    VtkCompositeFilter.cpp
     VtkCompositeGeoObjectFilter.cpp
     VtkCompositeImageToCylindersFilter.cpp
     VtkCompositeImageToPointCloudFilter.cpp
@@ -26,20 +19,58 @@ set(SOURCES
     VtkCompositePointToGlyphFilter.cpp
     VtkCompositeTextureOnSurfaceFilter.cpp
     VtkCompositeThresholdFilter.cpp
-    VtkConsoleOutputWindow.cpp
-    VtkCustomInteractorStyle.cpp
-    VtkFilterFactory.cpp
     VtkGeoImageSource.cpp
     VtkImageDataToLinePolyDataFilter.cpp
     VtkImageDataToPointCloudFilter.cpp
     VtkImageDataToSurfacePointsFilter.cpp
-    VtkPickCallback.cpp
-    VtkPolylinesSource.cpp
     VtkPointsSource.cpp
+    VtkPolylinesSource.cpp
     VtkRaster.cpp
     VtkStationSource.cpp
     VtkSurfacesSource.cpp
     VtkTextureOnSurfaceFilter.cpp
+)
+if(OGS_USE_NETCDF)
+    list(APPEND FILTER_SOURCES NetCdfConfigureDialog.cpp NetCdfConfigure.ui)
+    set(UIS NetCdfConfigure.ui)
+endif()
+
+ogs_add_library(VtkVisFilter ${FILTER_SOURCES})
+target_include_directories(VtkVisFilter PUBLIC ${VTK_INCLUDE_DIRS})
+target_link_libraries(VtkVisFilter PRIVATE GeoLib Qt5::Core Qt5::Widgets)
+
+if(OGS_USE_NETCDF)
+    target_link_libraries(
+        VtkVisFilter PUBLIC ${NETCDF_LIBRARIES_CXX} ${NETCDF_LIBRARIES_C}
+                            ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES}
+    )
+    if(OGS_USE_CONAN AND MSVC)
+        target_link_libraries(VtkVisFilter PUBLIC ${CONAN_LIBS})
+    endif()
+    # Workaround for system installed VTK (tested on arch)
+    if(NOT OGS_USE_CONAN)
+        target_include_directories(
+            VtkVisFilter SYSTEM PUBLIC ${NETCDF_INCLUDES_C}
+                                       ${NETCDF_INCLUDES_CXX}
+        )
+    endif()
+    add_autogen_include(VtkVisFilter)
+endif()
+
+# ---- VtkVis ----
+set(SOURCES
+    MeshFromRasterDialog.cpp
+    QVtkDataSetMapper.cpp
+    VisPrefsDialog.cpp
+    VisualizationWidget.cpp
+    VtkAddFilterDialog.cpp
+    VtkAlgorithmPropertyCheckbox.cpp
+    VtkAlgorithmPropertyLineEdit.cpp
+    VtkAlgorithmPropertyVectorEdit.cpp
+    VtkConsoleOutputWindow.cpp
+    VtkCustomInteractorStyle.cpp
+    VtkFilterFactory.cpp
+    VtkPickCallback.cpp
     VtkVisHelper.cpp
     VtkVisImageItem.cpp
     VtkVisPipeline.cpp
@@ -55,7 +86,6 @@ set(HEADERS
     VisPrefsDialog.h
     VisualizationWidget.h
     VtkAddFilterDialog.h
-    VtkAlgorithmProperties.h
     VtkAlgorithmPropertyLineEdit.h
     VtkAlgorithmPropertyCheckbox.h
     VtkAlgorithmPropertyVectorEdit.h
@@ -100,15 +130,16 @@ set(HEADERS
     VtkVisTabWidget.h
 )
 
-set(UIS MeshFromRaster.ui VisPrefs.ui VisualizationWidgetBase.ui
-        VtkAddFilterDialogBase.ui VtkVisTabWidgetBase.ui
+list(
+    APPEND
+    UIS
+    MeshFromRaster.ui
+    VisPrefs.ui
+    VisualizationWidgetBase.ui
+    VtkAddFilterDialogBase.ui
+    VtkVisTabWidgetBase.ui
 )
 
-if(OGS_USE_NETCDF)
-    set(SOURCES ${SOURCES} NetCdfConfigureDialog.h NetCdfConfigureDialog.cpp)
-    set(UIS ${UIS} NetCdfConfigure.ui)
-endif()
-
 # Visual Studio folder
 source_group("Filter Header Files" REGULAR_EXPRESSION "[.]*Filter.h")
 source_group("Filter Source Files" REGULAR_EXPRESSION "[.]*Filter.cpp")
@@ -132,7 +163,7 @@ include_directories(
     ${GUI_SOURCE_DIR_REL}/VtkModules/Qt
 )
 
-ogs_add_library(VtkVis STATIC ${SOURCES} ${HEADERS} ${UIS})
+ogs_add_library(VtkVis ${SOURCES} ${HEADERS} ${UIS})
 
 if(GEOTIFF_FOUND)
     target_compile_definitions(VtkVis PRIVATE GEOTIFF_FOUND)
@@ -141,26 +172,10 @@ if(GEOTIFF_FOUND)
 endif() # GEOTIFF_FOUND
 
 target_link_libraries(
-    VtkVis PUBLIC BaseLib GeoLib MeshLib DataHolderLib QtBase
+    VtkVis PUBLIC BaseLib GeoLib MeshLib DataHolderLib QtBase VtkVisFilter
     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}
-    )
-    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}
-        )
-    endif()
-endif()
-
 set_property(TARGET VtkVis PROPERTY FOLDER "DataExplorer")
 
 add_autogen_include(VtkVis)

Applications/Utils/PostProcessing/CMakeLists.txt

@@ -7,14 +7,8 @@ endif()
 if(OGS_BUILD_GUI)
     add_executable(Raster2PointCloud Raster2PointCloud.cpp)
     target_link_libraries(
-        Raster2PointCloud
-        GitInfoLib
-        ApplicationsFileIO
-        BaseLib
-        GeoLib
-        VtkVis
-        QtDataView
-        tclap
+        Raster2PointCloud ApplicationsFileIO BaseLib GitInfoLib tclap
+        VtkVisFilter
     )
     install(TARGETS Raster2PointCloud RUNTIME DESTINATION bin)
 endif()

Tests/CMakeLists.txt

@@ -91,7 +91,7 @@ if(OGS_BUILD_GUI)
                 Qt5::Gui
                 Qt5::Xml
                 Qt5::Network
-                VtkVis
+                VtkVisFilter
                 QtDataView
     )
     if(GEOTIFF_FOUND)