diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake index d5c5b2bde3541ab64e2e125fb5ded0b006cacea3..505828929067dbb42da1fcbe1433e011170d07ee 100644 --- a/Applications/DataExplorer/DataExplorer.cmake +++ b/Applications/DataExplorer/DataExplorer.cmake @@ -22,6 +22,7 @@ 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>) target_link_libraries( DataExplorer diff --git a/Applications/DataExplorer/main.cpp b/Applications/DataExplorer/main.cpp index eb33b1c2368798995fc3130687b6f3c3baef9a06..43fad6b622e958560d17d52185596cf17c207281 100644 --- a/Applications/DataExplorer/main.cpp +++ b/Applications/DataExplorer/main.cpp @@ -9,6 +9,15 @@ #include "VtkVis/VtkConsoleOutputWindow.h" #include "mainwindow.h" +// TODO: Replace this on VTK 9 upgrade, see +// https://discourse.vtk.org/t/vtk-use-file/3645/2 +#if VTK_VIA_CPM +#include <vtkAutoInit.h> +VTK_MODULE_INIT(vtkInteractionStyle) +VTK_MODULE_INIT(vtkRenderingFreeType) +VTK_MODULE_INIT(vtkRenderingOpenGL2) +#endif + int main(int argc, char* argv[]) { // needed to ensure appropriate OpenGL context is created for VTK rendering.