From 2f33cde1e5122db0b29a9459b9f09622fbd736e9 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Mon, 23 Mar 2020 12:35:51 +0100
Subject: [PATCH] Remove logog linkage.
---
Applications/ApplicationsLib/CMakeLists.txt | 2 +-
Applications/DataExplorer/DataExplorer.cmake | 1 -
Applications/DataExplorer/DataView/CMakeLists.txt | 1 -
Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt | 3 +--
Applications/DataExplorer/VtkVis/CMakeLists.txt | 2 +-
Applications/DataHolderLib/CMakeLists.txt | 2 +-
Applications/FileIO/CMakeLists.txt | 1 -
BaseLib/CMakeLists.txt | 3 +--
GeoLib/CMakeLists.txt | 2 +-
MaterialLib/SolidModels/MFront/CMakeLists.txt | 2 +-
MathLib/CMakeLists.txt | 2 +-
MeshGeoToolsLib/CMakeLists.txt | 2 +-
MeshLib/CMakeLists.txt | 1 -
NumLib/CMakeLists.txt | 1 -
ProcessLib/BoundaryCondition/Python/CMakeLists.txt | 1 -
ProcessLib/CMakeLists.txt | 1 -
ProcessLib/SourceTerms/Python/CMakeLists.txt | 1 -
17 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/Applications/ApplicationsLib/CMakeLists.txt b/Applications/ApplicationsLib/CMakeLists.txt
index b20709fdb11..bc9f59c09b0 100644
--- a/Applications/ApplicationsLib/CMakeLists.txt
+++ b/Applications/ApplicationsLib/CMakeLists.txt
@@ -6,7 +6,7 @@ set(LIB_SOURCES ${SOURCES_APPLICATIONSLIB})
ogs_add_library(ApplicationsLib ${LIB_SOURCES})
target_link_libraries(ApplicationsLib
- PUBLIC BaseLib GeoLib NumLib Processes logog
+ PUBLIC BaseLib GeoLib NumLib Processes
PRIVATE MathLib
MeshLib
MeshGeoToolsLib
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index e67925f37bc..9508e8b9b1d 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -49,7 +49,6 @@ target_link_libraries(DataExplorer
Qt5::Widgets
Qt5::Xml
Qt5::Network
- logog
${VTK_LIBRARIES}
)
diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index 8b65bdcea6c..8f00b96e83b 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -135,7 +135,6 @@ target_link_libraries(QtDataView
QtDiagramView
QtStratView
DataHolderLib
- logog
Qt5::Core
Qt5::Gui)
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index 96c1a84c45a..3f3d7b47b23 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -36,8 +36,7 @@ target_link_libraries(QtDiagramView
GeoLib
QtBase
DataHolderLib
- Qt5::Gui
- logog)
+ Qt5::Gui)
add_autogen_include(QtDiagramView)
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index 57815c57902..ab2f895cffb 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -142,7 +142,7 @@ target_link_libraries(VtkVis
DataHolderLib
QtBase
vtkIOImage
- PRIVATE MathLib ApplicationsFileIO Qt5::Gui logog)
+ PRIVATE MathLib ApplicationsFileIO Qt5::Gui)
if(OGS_USE_NETCDF)
target_link_libraries(VtkVis
diff --git a/Applications/DataHolderLib/CMakeLists.txt b/Applications/DataHolderLib/CMakeLists.txt
index 606d95218fd..f89c63f945d 100644
--- a/Applications/DataHolderLib/CMakeLists.txt
+++ b/Applications/DataHolderLib/CMakeLists.txt
@@ -4,4 +4,4 @@ get_source_files(SOURCES_DataHolderLib)
# Library
ogs_add_library(DataHolderLib ${SOURCES_DataHolderLib})
-target_link_libraries(DataHolderLib PUBLIC GeoLib MeshLib PRIVATE BaseLib logog)
+target_link_libraries(DataHolderLib PUBLIC GeoLib MeshLib PRIVATE BaseLib)
diff --git a/Applications/FileIO/CMakeLists.txt b/Applications/FileIO/CMakeLists.txt
index 995e3fa864f..4c4beeec8c8 100644
--- a/Applications/FileIO/CMakeLists.txt
+++ b/Applications/FileIO/CMakeLists.txt
@@ -29,7 +29,6 @@ target_link_libraries(ApplicationsFileIO
DataHolderLib
GeoLib
MathLib
- logog
PRIVATE MeshLib GitInfoLib std::filesystem)
if(OGS_BUILD_GUI)
diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt
index 390520d234a..7c4cc970d66 100644
--- a/BaseLib/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -8,8 +8,7 @@ endif()
# Create the library
ogs_add_library(BaseLib ${SOURCES})
-target_link_libraries(BaseLib PUBLIC logog Boost::boost)
-
+target_link_libraries(BaseLib PUBLIC Boost::boost)
if(MSVC)
target_link_libraries(BaseLib PUBLIC WinMM) # needed for timeGetTime
endif()
diff --git a/GeoLib/CMakeLists.txt b/GeoLib/CMakeLists.txt
index d6118a16d65..215621f0218 100644
--- a/GeoLib/CMakeLists.txt
+++ b/GeoLib/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
# Create the library
ogs_add_library(GeoLib ${SOURCES})
-target_link_libraries(GeoLib PUBLIC BaseLib MathLib logog PRIVATE tet)
+target_link_libraries(GeoLib PUBLIC BaseLib MathLib PRIVATE tet)
if(OGS_BUILD_GUI)
target_link_libraries(GeoLib PUBLIC Qt5::Xml Qt5::XmlPatterns)
diff --git a/MaterialLib/SolidModels/MFront/CMakeLists.txt b/MaterialLib/SolidModels/MFront/CMakeLists.txt
index d1e05c8f850..01638bf7381 100644
--- a/MaterialLib/SolidModels/MFront/CMakeLists.txt
+++ b/MaterialLib/SolidModels/MFront/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCES MFront.cpp MFront.h)
ogs_add_library(MaterialLib_SolidModels_MFront ${SOURCES})
target_link_libraries(MaterialLib_SolidModels_MFront
- PUBLIC BaseLib NumLib logog OgsMFrontBehaviour
+ PUBLIC BaseLib NumLib OgsMFrontBehaviour
PRIVATE MathLib MeshLib)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
diff --git a/MathLib/CMakeLists.txt b/MathLib/CMakeLists.txt
index a27d9fa6cee..47294058196 100644
--- a/MathLib/CMakeLists.txt
+++ b/MathLib/CMakeLists.txt
@@ -30,7 +30,7 @@ target_include_directories(MathLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
set_target_properties(MathLib PROPERTIES LINKER_LANGUAGE CXX)
-target_link_libraries(MathLib PUBLIC BaseLib logog ${OpenMP_CXX_LIBRARIES})
+target_link_libraries(MathLib PUBLIC BaseLib ${OpenMP_CXX_LIBRARIES})
if(CVODE_FOUND)
target_include_directories(MathLib PRIVATE ${CVODE_INCLUDE_DIRS})
diff --git a/MeshGeoToolsLib/CMakeLists.txt b/MeshGeoToolsLib/CMakeLists.txt
index 4bafd9791be..934fa35f92b 100644
--- a/MeshGeoToolsLib/CMakeLists.txt
+++ b/MeshGeoToolsLib/CMakeLists.txt
@@ -6,4 +6,4 @@ ogs_add_library(MeshGeoToolsLib ${SOURCES})
target_link_libraries(MeshGeoToolsLib
PUBLIC GeoLib MathLib
- PRIVATE BaseLib MeshLib logog)
+ PRIVATE BaseLib MeshLib)
diff --git a/MeshLib/CMakeLists.txt b/MeshLib/CMakeLists.txt
index b739688c335..c0dcd4f4017 100644
--- a/MeshLib/CMakeLists.txt
+++ b/MeshLib/CMakeLists.txt
@@ -27,5 +27,4 @@ target_link_libraries(MeshLib
PUBLIC BaseLib
GeoLib
MathLib
- logog
${VTK_LIBRARIES})
diff --git a/NumLib/CMakeLists.txt b/NumLib/CMakeLists.txt
index 7d66a36d90b..99c97499957 100644
--- a/NumLib/CMakeLists.txt
+++ b/NumLib/CMakeLists.txt
@@ -24,5 +24,4 @@ target_link_libraries(NumLib
GeoLib
MathLib
MeshLib
- logog
PRIVATE MeshGeoToolsLib)
diff --git a/ProcessLib/BoundaryCondition/Python/CMakeLists.txt b/ProcessLib/BoundaryCondition/Python/CMakeLists.txt
index caa5e62b1ea..f239bfb5c31 100644
--- a/ProcessLib/BoundaryCondition/Python/CMakeLists.txt
+++ b/ProcessLib/BoundaryCondition/Python/CMakeLists.txt
@@ -14,7 +14,6 @@ target_link_libraries(ProcessLibBoundaryConditionPython
MathLib
MeshLib
NumLib
- logog
${Python3_LIBRARIES}
PRIVATE pybind11::pybind11)
diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt
index 71ae82110b6..77330c15392 100644
--- a/ProcessLib/CMakeLists.txt
+++ b/ProcessLib/CMakeLists.txt
@@ -26,7 +26,6 @@ target_link_libraries(ProcessLib
MeshGeoToolsLib
MeshLib
NumLib
- logog
PRIVATE ParameterLib GitInfoLib)
if (OGS_BUILD_PROCESS_ComponentTransport
diff --git a/ProcessLib/SourceTerms/Python/CMakeLists.txt b/ProcessLib/SourceTerms/Python/CMakeLists.txt
index 0406ad087e4..872affdaed1 100644
--- a/ProcessLib/SourceTerms/Python/CMakeLists.txt
+++ b/ProcessLib/SourceTerms/Python/CMakeLists.txt
@@ -13,7 +13,6 @@ target_link_libraries(ProcessLibSourceTermPython
MathLib
MeshLib
NumLib
- logog
${Python3_LIBRARIES}
PRIVATE pybind11::pybind11)
--
GitLab