diff --git a/Applications/DataExplorer/Base/CMakeLists.txt b/Applications/DataExplorer/Base/CMakeLists.txt
index 0a59c05cbe1e8bbbf307a8718d188f570407a413..54c4f444998ddb02a6b48524e11b63d5029ecf98 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 714b20455dd4363132116429695d0b96794713c3..5988fd0c66a661b452a6be86142600977ab129a4 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 1a1559c6285caab4646c9e2c38f0ec42a2bc02e0..a928e0d77125326dfedade547e8ac7b29b9ffef6 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 222f9f36ff5df6cd08206a187be17cf492904443..d10e95a44507f734e0c04194bbe772c12e7c9f15 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 28dff79f9881d72b3d3d5dc999c7514458ceab33..4b4f5b1afd4e7e72ca5e683f03c80fb72b92f96e 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 a80c3edb8cf186fd067d14c9f293cba73602d658..5ca9470d996b14b125714aeb4a48c8cd35675c1a 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 8b5fac03986501f8812853cb57d6acd7522def58..9136929450a12a4ec57812ef395f5b3a1156bd57 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
+)