Moved Gui to Applications/DataExplorer.

- moved ProjectData.* to Applications/ApplicationsLib - removed Vrpn folder in DataExplorer

Moved Gui to Applications/DataExplorer.
2e58b089 · Lars Bilke · 47fda365 · 2e58b089 · 2e58b089 · 2e58b089
Commit 2e58b089 authored 10 years ago by Lars Bilke
--- a/Applications/ApplicationsLib/CMakeLists.txt
+++ b/Applications/ApplicationsLib/CMakeLists.txt
+# Source files
+SET ( LIB_SOURCES ProjectData.cpp )
+
+# Library
+ADD_LIBRARY (ApplicationsLib STATIC ${LIB_SOURCES})
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../DataExplorer/DataView)
+
+TARGET_LINK_LIBRARIES( ApplicationsLib
+	GeoLib
+	ProcessLib
+)
--- a/Applications/ProjectData.cpp
+++ b/Applications/ProjectData.cpp
--- a/Applications/ProjectData.h
+++ b/Applications/ProjectData.h
@@ -16,7 +16,7 @@
 #include <boost/property_tree/ptree.hpp>

 #ifdef OGS_BUILD_GUI
-#include "Gui/DataView/GEOModels.h"
+#include "GEOModels.h"
 #else
 #include "GeoLib/GEOObjects.h"
 #endif

--- a/Applications/CMakeLists.txt
+++ b/Applications/CMakeLists.txt
-# Source files
-SET ( LIB_SOURCES ProjectData.cpp )
+ADD_SUBDIRECTORY(ApplicationsLib)

-# Library
-ADD_LIBRARY (ApplicationsLib STATIC ${LIB_SOURCES})
-
-TARGET_LINK_LIBRARIES( ApplicationsLib
-        GeoLib
-        ProcessLib
-    )
+IF(OGS_BUILD_GUI)
+	ADD_DEFINITIONS(-DOGS_BUILD_GUI)
+	ADD_SUBDIRECTORY(DataExplorer)
+ENDIF() # OGS_BUILD_GUI
--- a/Gui/Base/CMakeLists.txt
+++ b/Gui/Base/CMakeLists.txt
--- a/Gui/Base/CheckboxDelegate.cpp
+++ b/Gui/Base/CheckboxDelegate.cpp
--- a/Gui/Base/CheckboxDelegate.h
+++ b/Gui/Base/CheckboxDelegate.h
--- a/Gui/Base/ColorPickerPushButton.cpp
+++ b/Gui/Base/ColorPickerPushButton.cpp
--- a/Gui/Base/ColorPickerPushButton.h
+++ b/Gui/Base/ColorPickerPushButton.h
--- a/Gui/Base/LastSavedFileDirectory.h
+++ b/Gui/Base/LastSavedFileDirectory.h
--- a/Gui/Base/OGSError.cpp
+++ b/Gui/Base/OGSError.cpp
--- a/Gui/Base/OGSError.h
+++ b/Gui/Base/OGSError.h
--- a/Gui/Base/QNonScalableGraphicsTextItem.cpp
+++ b/Gui/Base/QNonScalableGraphicsTextItem.cpp
--- a/Gui/Base/QNonScalableGraphicsTextItem.h
+++ b/Gui/Base/QNonScalableGraphicsTextItem.h
--- a/Gui/Base/QValueTooltipSlider.cpp
+++ b/Gui/Base/QValueTooltipSlider.cpp
--- a/Gui/Base/QValueTooltipSlider.h
+++ b/Gui/Base/QValueTooltipSlider.h
--- a/Gui/Base/RecentFiles.cpp
+++ b/Gui/Base/RecentFiles.cpp
--- a/Gui/Base/RecentFiles.h
+++ b/Gui/Base/RecentFiles.h
--- a/Gui/Base/StrictDoubleValidator.h
+++ b/Gui/Base/StrictDoubleValidator.h
--- a/Gui/Base/StrictIntValidator.h
+++ b/Gui/Base/StrictIntValidator.h