From 1b53047e27a6aca22e28fe2b96770c0b48b7feb1 Mon Sep 17 00:00:00 2001
From: Norihiro Watanabe <norihiro.watanabe@ufz.de>
Date: Wed, 15 Jun 2016 17:59:46 +0200
Subject: [PATCH] add missing dependency for dynamic linking

---
 Applications/DataExplorer/Base/CMakeLists.txt             | 5 ++++-
 Applications/DataExplorer/DataView/CMakeLists.txt         | 4 +++-
 .../DataExplorer/DataView/DiagramView/CMakeLists.txt      | 8 +++++++-
 Applications/DataExplorer/VtkAct/CMakeLists.txt           | 7 +++++--
 Applications/DataExplorer/VtkVis/CMakeLists.txt           | 2 +-
 Applications/Utils/OGSFileConverter/CMakeLists.txt        | 4 +++-
 MaterialsLib/CMakeLists.txt                               | 4 ++++
 7 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/Applications/DataExplorer/Base/CMakeLists.txt b/Applications/DataExplorer/Base/CMakeLists.txt
index 0a59c05cbe1..54c4f444998 100644
--- a/Applications/DataExplorer/Base/CMakeLists.txt
+++ b/Applications/DataExplorer/Base/CMakeLists.txt
@@ -39,6 +39,9 @@ add_library(QtBase
     ${HEADERS}
 )
 
-target_link_libraries(QtBase PUBLIC Qt4::QtGui)
+target_link_libraries(QtBase
+    Qt4::QtGui
+    logog
+    GeoLib)
 
 set_property(TARGET QtBase PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index 714b20455dd..5988fd0c66a 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -121,7 +121,7 @@ if(GEOTIFF_FOUND)
     include_directories(${GEOTIFF_INCLUDE_DIRS})
 endif() # GEOTIFF_FOUND
 
-add_library(QtDataView
+add_library(QtDataView STATIC
     ${SOURCES}
     ${HEADERS}
     ${UIS}
@@ -133,6 +133,8 @@ target_link_libraries(QtDataView
     FileIO
     DataHolderLib
     QtBase
+    QtStratView
+    VtkVis
 )
 add_dependencies(QtDataView QtDiagramView QtStratView)
 
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index 1a1559c6285..a928e0d7712 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -39,6 +39,12 @@ add_library(QtDiagramView
     ${UIS}
 )
 
-target_link_libraries(QtDiagramView Qt4::QtGui)
+target_link_libraries(QtDiagramView
+    Qt4::QtGui
+    logog
+    BaseLib
+    GeoLib
+    QtBase
+    )
 
 set_property(TARGET QtDiagramView PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/VtkAct/CMakeLists.txt b/Applications/DataExplorer/VtkAct/CMakeLists.txt
index 222f9f36ff5..d10e95a4450 100644
--- a/Applications/DataExplorer/VtkAct/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkAct/CMakeLists.txt
@@ -25,7 +25,10 @@ add_library( VtkAct
 
 ADD_VTK_DEPENDENCY(VtkAct)
 
-target_link_libraries( VtkAct Qt4::QtCore )
-target_link_libraries( VtkAct ${VTK_LIBRARIES} )
+target_link_libraries( VtkAct
+    Qt4::QtCore
+    ${VTK_LIBRARIES}
+    logog
+    )
 
 set_property(TARGET VtkAct PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index 28dff79f988..4b4f5b1afd4 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -114,7 +114,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}/../DataView
 )
 
-add_library(VtkVis
+add_library(VtkVis STATIC
     ${SOURCES}
     ${HEADERS}
     ${UIS}
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index a80c3edb8cf..5ca9470d996 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -34,7 +34,9 @@ add_library(OGSFileConverterLib
     ${HEADERS}
     ${UIS}
 )
-target_link_libraries(OGSFileConverterLib QtBase)
+target_link_libraries(OGSFileConverterLib
+    QtBase
+    MeshLib)
 
 add_executable(OGSFileConverter main.cpp)
 
diff --git a/MaterialsLib/CMakeLists.txt b/MaterialsLib/CMakeLists.txt
index 8b5fac03986..9136929450a 100644
--- a/MaterialsLib/CMakeLists.txt
+++ b/MaterialsLib/CMakeLists.txt
@@ -4,3 +4,7 @@ GET_SOURCE_FILES(SOURCES_ADSORPTION Adsorption)
 set(SOURCES ${SOURCES} ${SOURCES_ADSORPTION})
 
 add_library(MaterialsLib ${SOURCES} )
+target_link_libraries(MaterialsLib
+    logog
+    BaseLib
+)
-- 
GitLab