2.12.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 8f35d2c6 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Fixed campvis-application not being compilable without enabled scripting support.

refs #643
parent d335d251
...@@ -29,7 +29,6 @@ FILE(GLOB CampvisApplicationForms ...@@ -29,7 +29,6 @@ FILE(GLOB CampvisApplicationForms
) )
SET(CampvisApplicationToBeMocced SET(CampvisApplicationToBeMocced
gui/completinglualineedit.h
gui/mainwindow.h gui/mainwindow.h
gui/datacontainerinspectorcanvas.h gui/datacontainerinspectorcanvas.h
gui/datacontainerinspectorwidget.h gui/datacontainerinspectorwidget.h
...@@ -40,8 +39,6 @@ SET(CampvisApplicationToBeMocced ...@@ -40,8 +39,6 @@ SET(CampvisApplicationToBeMocced
gui/qtdatahandle.h gui/qtdatahandle.h
gui/logviewerwidget.h gui/logviewerwidget.h
gui/loghighlighter.h gui/loghighlighter.h
gui/luatablewidget.h
gui/scriptingwidget.h
gui/workflowcontrollerwidget.h gui/workflowcontrollerwidget.h
gui/mdi/mdidockarea.h gui/mdi/mdidockarea.h
gui/mdi/mdidockablewindow.h gui/mdi/mdidockablewindow.h
...@@ -72,6 +69,26 @@ SET(CampvisApplicationToBeMocced ...@@ -72,6 +69,26 @@ SET(CampvisApplicationToBeMocced
) )
IF(CAMPVIS_ENABLE_SCRIPTING)
LIST(APPEND CampvisApplicationToBeMocced
${CMAKE_CURRENT_SOURCE_DIR}/gui/completinglualineedit.h
${CMAKE_CURRENT_SOURCE_DIR}/gui/luatablewidget.h
${CMAKE_CURRENT_SOURCE_DIR}/gui/scriptingwidget.h
)
ELSE(CAMPVIS_ENABLE_SCRIPTING)
LIST(REMOVE_ITEM CampvisApplicationSources
${CMAKE_CURRENT_SOURCE_DIR}/gui/completinglualineedit.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gui/luatablewidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gui/scriptingwidget.cpp
)
LIST(REMOVE_ITEM CampvisApplicationHeaders
${CMAKE_CURRENT_SOURCE_DIR}/gui/completinglualineedit.h
${CMAKE_CURRENT_SOURCE_DIR}/gui/luatablewidget.h
${CMAKE_CURRENT_SOURCE_DIR}/gui/scriptingwidget.h
)
ENDIF(CAMPVIS_ENABLE_SCRIPTING)
# add additional sources from the activated modules # add additional sources from the activated modules
FOREACH(ModFile ${CampvisModulesApplicationSources}) FOREACH(ModFile ${CampvisModulesApplicationSources})
# adjust relative path # adjust relative path
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include "scripting/luagen/properties/propertycollectionluascriptgenerator.h" #include "scripting/luagen/properties/propertycollectionluascriptgenerator.h"
#include "scripting/luagen/properties/abstractpropertylua.h" #include "scripting/luagen/properties/abstractpropertylua.h"
#include "application/gui/luatablewidget.h" #include "application/gui/luatablewidget.h"
#include "application/gui/scriptingwidget.h"
#endif #endif
namespace campvis { namespace campvis {
...@@ -379,8 +380,10 @@ namespace campvis { ...@@ -379,8 +380,10 @@ namespace campvis {
_logViewer->init(); _logViewer->init();
#ifdef CAMPVIS_HAS_SCRIPTING
if (_scriptingConsoleWidget) if (_scriptingConsoleWidget)
_scriptingConsoleWidget->init(); _scriptingConsoleWidget->init();
#endif
} }
void MainWindow::deinit() { void MainWindow::deinit() {
...@@ -389,8 +392,10 @@ namespace campvis { ...@@ -389,8 +392,10 @@ namespace campvis {
_logViewer->deinit(); _logViewer->deinit();
#ifdef CAMPVIS_HAS_SCRIPTING
if (_scriptingConsoleWidget) if (_scriptingConsoleWidget)
_scriptingConsoleWidget->deinit(); _scriptingConsoleWidget->deinit();
#endif
} }
MdiDockableWindow * MainWindow::addVisualizationPipelineWidget(const std::string& name, QWidget* canvas) { MdiDockableWindow * MainWindow::addVisualizationPipelineWidget(const std::string& name, QWidget* canvas) {
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "application/gui/pipelinetreewidget.h" #include "application/gui/pipelinetreewidget.h"
#include "application/gui/properties/propertycollectionwidget.h" #include "application/gui/properties/propertycollectionwidget.h"
#include "application/gui/logviewerwidget.h" #include "application/gui/logviewerwidget.h"
#include "application/gui/scriptingwidget.h"
#include "application/gui/workflowcontrollerwidget.h" #include "application/gui/workflowcontrollerwidget.h"
#include "application/tools/qtexteditlog.h" #include "application/tools/qtexteditlog.h"
#include "application/ui_mainwindow.h" #include "application/ui_mainwindow.h"
...@@ -50,6 +49,7 @@ namespace campvis { ...@@ -50,6 +49,7 @@ namespace campvis {
class DataContainerInspectorCanvas; class DataContainerInspectorCanvas;
class MdiDockableWindow; class MdiDockableWindow;
class LuaTableTreeWidget; class LuaTableTreeWidget;
class ScriptingWidget;
/** /**
* Main Window for the CAMPVis application. * Main Window for the CAMPVis application.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment