From 5cf60ca45930a8c813b79c490c22b41ac9ce7484 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 23 Sep 2014 11:26:03 +0200
Subject: [PATCH] Renamed DiagramView and StratView to QtDiagramView and
QtStratView.
---
Applications/DataExplorer/DataExplorer.cmake | 2 +-
Applications/DataExplorer/DataView/CMakeLists.txt | 4 ++--
.../DataExplorer/DataView/DiagramView/CMakeLists.txt | 7 +++----
.../DataExplorer/DataView/StratView/CMakeLists.txt | 6 +++---
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 0eb650222f8..91351597fe5 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -78,7 +78,7 @@ TARGET_LINK_LIBRARIES( ogs-gui
#MSHGEOTOOLS
QtBase
QtDataView
- StratView
+ QtStratView
VtkVis
VtkAct
${Boost_LIBRARIES}
diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index eb1566eb452..748d2425b7e 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -179,8 +179,8 @@ target_link_libraries( QtDataView
GeoLib
MeshLib
QtBase
- DiagramView
- StratView
+ QtDiagramView
+ QtStratView
shp
)
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index 10bfe2b0fc1..a0ab870c436 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -55,8 +55,7 @@ INCLUDE_DIRECTORIES(
SOURCE_GROUP("Moc Files" REGULAR_EXPRESSION moc_*)
# Create the library
-#add_executable( DiagramView
-ADD_LIBRARY( DiagramView STATIC
+ADD_LIBRARY( QtDiagramView STATIC
${SOURCES}
${HEADERS}
${MOC_HEADERS}
@@ -65,9 +64,9 @@ ADD_LIBRARY( DiagramView STATIC
)
# Link Qt library
-TARGET_LINK_LIBRARIES( DiagramView
+TARGET_LINK_LIBRARIES( QtDiagramView
${QT_LIBRARIES}
GeoLib
)
-SET_PROPERTY(TARGET DiagramView PROPERTY FOLDER "DataExplorer")
+SET_PROPERTY(TARGET QtDiagramView PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index 05ef44cec74..8b655b18f1c 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -47,7 +47,7 @@ source_group("Moc Files" REGULAR_EXPRESSION moc_*)
# Create the library
#add_executable( StratView
-add_library( StratView STATIC
+add_library( QtStratView STATIC
${SOURCES}
${HEADERS}
${MOC_HEADERS}
@@ -56,11 +56,11 @@ add_library( StratView STATIC
)
# Link Qt library
-target_link_libraries( StratView
+target_link_libraries( QtStratView
${QT_LIBRARIES}
BaseLib
GeoLib
MathLib
)
-set_property(TARGET StratView PROPERTY FOLDER "DataExplorer")
+set_property(TARGET QtStratView PROPERTY FOLDER "DataExplorer")
--
GitLab