From 07599339d9c40ececb0b941d4869455976532c09 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Tue, 12 Apr 2016 23:54:33 +0000
Subject: [PATCH] Update link dependencies.
---
Applications/ApplicationsLib/CMakeLists.txt | 1 -
Applications/CLI/CMakeLists.txt | 4 ++++
Applications/DataExplorer/DataExplorer.cmake | 2 ++
.../DataExplorer/DataView/StratView/CMakeLists.txt | 2 +-
Applications/Utils/OGSFileConverter/CMakeLists.txt | 7 ++++++-
FileIO/CMakeLists.txt | 2 +-
GeoLib/CMakeLists.txt | 1 -
MeshGeoToolsLib/CMakeLists.txt | 1 -
MeshLib/CMakeLists.txt | 1 -
ProcessLib/CMakeLists.txt | 2 --
SimpleTests/MeshTests/CMakeLists.txt | 2 --
SimpleTests/MeshTests/MPI/CMakeLists.txt | 2 --
Tests/CMakeLists.txt | 4 +++-
13 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/Applications/ApplicationsLib/CMakeLists.txt b/Applications/ApplicationsLib/CMakeLists.txt
index 6316f23afea..071e323937c 100644
--- a/Applications/ApplicationsLib/CMakeLists.txt
+++ b/Applications/ApplicationsLib/CMakeLists.txt
@@ -9,7 +9,6 @@ target_link_libraries(ApplicationsLib
NumLib
ProcessLib
${VTK_LIBRARIES}
- logog
)
ADD_VTK_DEPENDENCY(ApplicationsLib)
diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index 8324aba968d..810d5001909 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -5,6 +5,10 @@ add_executable(ogs
target_link_libraries(ogs
ApplicationsLib
+ AssemblerLib
+ MeshGeoToolsLib
+ ProcessLib
+ NumLib
FileIO
)
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 5bfac32991b..70ca1d8aef1 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -55,6 +55,7 @@ target_link_libraries(DataExplorer
ApplicationsLib
DataHolderLib
FileIO
+ InSituLib
QtDataView
QtDiagramView
QtStratView
@@ -63,6 +64,7 @@ target_link_libraries(DataExplorer
Threads::Threads
OGSFileConverterLib
vtkGUISupportQt
+ logog
)
if(CMAKE_CROSSCOMPILING)
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index 429e13c37f9..efc44136bac 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -30,6 +30,6 @@ add_library(QtStratView
${UIS}
)
-target_link_libraries(QtStratView Qt4::QtGui)
+target_link_libraries(QtStratView Qt4::QtGui QtBase)
set_property(TARGET QtStratView PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 0ad4be4c44e..2cde9ff9fc0 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -38,7 +38,12 @@ target_link_libraries(OGSFileConverterLib QtBase)
add_executable(OGSFileConverter main.cpp)
-target_link_libraries(OGSFileConverter OGSFileConverterLib FileIO QtBase)
+target_link_libraries(OGSFileConverter
+ ApplicationsLib
+ OGSFileConverterLib
+ FileIO
+ QtBase
+ GeoLib)
ADD_VTK_DEPENDENCY(OGSFileConverter)
include(${QT_USE_FILE})
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 3c2152b5ca4..969ed1ff3ad 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -57,8 +57,8 @@ add_library(FileIO ${SOURCES})
target_link_libraries(FileIO
GeoLib
- InSituLib
MeshLib
+ InSituLib
logog
)
if(QT4_FOUND)
diff --git a/GeoLib/CMakeLists.txt b/GeoLib/CMakeLists.txt
index 7efcc2985af..1938997b3a1 100644
--- a/GeoLib/CMakeLists.txt
+++ b/GeoLib/CMakeLists.txt
@@ -9,7 +9,6 @@ add_library(GeoLib ${SOURCES_GeoLib}
target_link_libraries(GeoLib
BaseLib
MathLib
- logog
)
if(TARGET Boost)
diff --git a/MeshGeoToolsLib/CMakeLists.txt b/MeshGeoToolsLib/CMakeLists.txt
index 19fcf7d9ee3..728c484ac92 100644
--- a/MeshGeoToolsLib/CMakeLists.txt
+++ b/MeshGeoToolsLib/CMakeLists.txt
@@ -10,7 +10,6 @@ target_link_libraries(MeshGeoToolsLib
MeshLib
GeoLib
FileIO
- logog
)
if(TARGET Boost)
diff --git a/MeshLib/CMakeLists.txt b/MeshLib/CMakeLists.txt
index 4e783d668d7..b275ab4e15c 100644
--- a/MeshLib/CMakeLists.txt
+++ b/MeshLib/CMakeLists.txt
@@ -22,7 +22,6 @@ target_link_libraries(MeshLib
GeoLib
MathLib
${VTK_LIBRARIES}
- logog
)
ADD_VTK_DEPENDENCY(MeshLib)
diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt
index d8bffbd0bec..a4006e51595 100644
--- a/ProcessLib/CMakeLists.txt
+++ b/ProcessLib/CMakeLists.txt
@@ -10,11 +10,9 @@ add_library(ProcessLib ${SOURCES})
target_link_libraries(ProcessLib
AssemblerLib
- MeshLib
MeshGeoToolsLib
NumLib # for shape matrices
${VTK_LIBRARIES}
- logog
)
ADD_VTK_DEPENDENCY(ProcessLib)
diff --git a/SimpleTests/MeshTests/CMakeLists.txt b/SimpleTests/MeshTests/CMakeLists.txt
index 1610e782ba2..a8cb4900136 100644
--- a/SimpleTests/MeshTests/CMakeLists.txt
+++ b/SimpleTests/MeshTests/CMakeLists.txt
@@ -11,7 +11,6 @@ target_link_libraries(MeshRead
MathLib
BaseLib
GeoLib
- logog
${BOOST_LIBRARIES}
)
@@ -28,6 +27,5 @@ target_link_libraries(MeshSearchTest
MathLib
BaseLib
GeoLib
- logog
${BOOST_LIBRARIES}
)
diff --git a/SimpleTests/MeshTests/MPI/CMakeLists.txt b/SimpleTests/MeshTests/MPI/CMakeLists.txt
index ce6812080df..66ff53474fa 100644
--- a/SimpleTests/MeshTests/MPI/CMakeLists.txt
+++ b/SimpleTests/MeshTests/MPI/CMakeLists.txt
@@ -5,8 +5,6 @@ add_executable(test_node_partitioned_mesh
target_link_libraries(test_node_partitioned_mesh
MeshLib
FileIO
- BaseLib
- logog
${ADDITIONAL_LIBS}
${BOOST_LIBRARIES}
)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 248daaec388..cd2f627f592 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -33,9 +33,11 @@ target_link_libraries(testrunner
ApplicationsLib
AssemblerLib
FileIO
+ GTest
+ InSituLib
MeshGeoToolsLib
+ MeshLib
NumLib
- GTest
Threads::Threads
)
ADD_VTK_DEPENDENCY(testrunner)
--
GitLab