Skip to content
Snippets Groups Projects
Commit 645dc867 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

[cmake] Link spdlog. Private dependency.

This reduces total build time.
Only in BaseLib spdlog is linked public.
parent aabe2346
No related branches found
No related tags found
No related merge requests found
Showing
with 47 additions and 46 deletions
......@@ -11,7 +11,8 @@ target_link_libraries(ApplicationsLib
MeshLib
MeshGeoToolsLib
ParameterLib
ProcessLib)
ProcessLib
spdlog::spdlog)
# Set cpp definitions if the cmake option is enabled for the given process.
foreach(process ${ProcessesList})
......
......@@ -49,6 +49,7 @@ target_link_libraries(DataExplorer
Qt5::Widgets
Qt5::Xml
Qt5::Network
spdlog::spdlog
${VTK_LIBRARIES}
)
......
......@@ -135,6 +135,7 @@ target_link_libraries(QtDataView
QtDiagramView
QtStratView
DataHolderLib
spdlog::spdlog
Qt5::Core
Qt5::Gui)
......
......@@ -36,7 +36,8 @@ target_link_libraries(QtDiagramView
GeoLib
QtBase
DataHolderLib
Qt5::Gui)
Qt5::Gui
spdlog::spdlog)
add_autogen_include(QtDiagramView)
......
......@@ -142,7 +142,7 @@ target_link_libraries(VtkVis
DataHolderLib
QtBase
vtkIOImage
PRIVATE MathLib ApplicationsFileIO Qt5::Gui)
PRIVATE MathLib ApplicationsFileIO Qt5::Gui spdlog::spdlog)
if(OGS_USE_NETCDF)
target_link_libraries(VtkVis
......
......@@ -4,4 +4,7 @@ get_source_files(SOURCES_DataHolderLib)
# Library
ogs_add_library(DataHolderLib ${SOURCES_DataHolderLib})
target_link_libraries(DataHolderLib PUBLIC GeoLib MeshLib PRIVATE BaseLib)
target_link_libraries(
DataHolderLib
PUBLIC GeoLib MeshLib
PRIVATE BaseLib spdlog::spdlog)
......@@ -29,7 +29,7 @@ target_link_libraries(ApplicationsFileIO
DataHolderLib
GeoLib
MathLib
PRIVATE MeshLib GitInfoLib std::filesystem)
PRIVATE MeshLib GitInfoLib std::filesystem spdlog::spdlog)
if(OGS_BUILD_GUI)
# Needed for the XmlPrjInterface, which links the DE/Base/OGSError.h.
......
......@@ -8,7 +8,10 @@ endif()
# Create the library
ogs_add_library(BaseLib ${SOURCES})
target_link_libraries(BaseLib PUBLIC Boost::boost)
target_link_libraries(
BaseLib
PUBLIC Boost::boost spdlog::spdlog)
if(MSVC)
target_link_libraries(BaseLib PUBLIC WinMM) # needed for timeGetTime
endif()
......
......@@ -10,6 +10,6 @@ ogs_add_library(ChemistryLib ${SOURCES})
include(GenerateExportHeader)
generate_export_header(ChemistryLib)
target_link_libraries(ChemistryLib PUBLIC iphreeqc PRIVATE NumLib)
target_link_libraries(ChemistryLib PUBLIC iphreeqc PRIVATE NumLib spdlog::spdlog)
set_target_properties(ChemistryLib PROPERTIES CXX_STANDARD 14)
......@@ -12,7 +12,7 @@ endif()
# Create the library
ogs_add_library(GeoLib ${SOURCES})
target_link_libraries(GeoLib PUBLIC BaseLib MathLib PRIVATE tet)
target_link_libraries(GeoLib PUBLIC BaseLib MathLib PRIVATE tet spdlog::spdlog)
if(OGS_BUILD_GUI)
target_link_libraries(GeoLib PUBLIC Qt5::Xml Qt5::XmlPatterns)
......
......@@ -40,7 +40,8 @@ include(GenerateExportHeader)
generate_export_header(MaterialLib)
target_include_directories(MaterialLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(MaterialLib PRIVATE MathLib MeshLib ParameterLib)
target_link_libraries(MaterialLib PRIVATE MathLib MeshLib ParameterLib
spdlog::spdlog)
if(OGS_USE_MFRONT)
target_link_libraries(MaterialLib PUBLIC MaterialLib_SolidModels_MFront)
......
......@@ -6,7 +6,7 @@ ogs_add_library(MaterialLib_SolidModels_MFront ${SOURCES})
target_link_libraries(MaterialLib_SolidModels_MFront
PUBLIC BaseLib NumLib OgsMFrontBehaviour
PRIVATE MathLib MeshLib)
PRIVATE MathLib MeshLib spdlog::spdlog)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${PROJECT_SOURCE_DIR}/ThirdParty/MGIS")
......
......@@ -30,7 +30,10 @@ target_include_directories(MathLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
set_target_properties(MathLib PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(MathLib PUBLIC BaseLib ${OpenMP_CXX_LIBRARIES})
target_link_libraries(
MathLib
PUBLIC BaseLib ${OpenMP_CXX_LIBRARIES}
PRIVATE spdlog::spdlog)
if(CVODE_FOUND)
target_include_directories(MathLib PRIVATE ${CVODE_INCLUDE_DIRS})
......
......@@ -6,4 +6,4 @@ ogs_add_library(MeshGeoToolsLib ${SOURCES})
target_link_libraries(MeshGeoToolsLib
PUBLIC GeoLib MathLib
PRIVATE BaseLib MeshLib)
PRIVATE BaseLib MeshLib spdlog::spdlog)
......@@ -23,8 +23,7 @@ endif()
# Create the library
ogs_add_library(MeshLib ${SOURCES})
target_link_libraries(MeshLib
PUBLIC BaseLib
GeoLib
MathLib
${VTK_LIBRARIES})
target_link_libraries(
MeshLib
PUBLIC BaseLib GeoLib MathLib ${VTK_LIBRARIES}
PRIVATE spdlog::spdlog)
......@@ -19,9 +19,7 @@ target_include_directories(NumLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
set_target_properties(NumLib PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(NumLib
PUBLIC BaseLib
GeoLib
MathLib
MeshLib
PRIVATE MeshGeoToolsLib)
target_link_libraries(
NumLib
PUBLIC BaseLib GeoLib MathLib MeshLib
PRIVATE MeshGeoToolsLib spdlog::spdlog)
......@@ -7,4 +7,4 @@ include(GenerateExportHeader)
generate_export_header(ParameterLib)
target_include_directories(ParameterLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(ParameterLib PUBLIC MathLib PRIVATE BaseLib MeshLib)
target_link_libraries(ParameterLib PUBLIC MathLib PRIVATE BaseLib MeshLib spdlog::spdlog)
......@@ -9,13 +9,10 @@ ogs_add_library(ProcessLibBoundaryConditionPython
target_compile_definitions(ProcessLibBoundaryConditionPython PUBLIC
OGS_USE_PYTHON)
target_link_libraries(ProcessLibBoundaryConditionPython
PUBLIC BaseLib
MathLib
MeshLib
NumLib
${Python3_LIBRARIES}
PRIVATE pybind11::pybind11)
target_link_libraries(
ProcessLibBoundaryConditionPython
PUBLIC BaseLib MathLib MeshLib NumLib ${Python3_LIBRARIES}
PRIVATE pybind11::pybind11 spdlog::spdlog)
# For the embedded Python module
ogs_add_library(ProcessLibBoundaryConditionPythonModule
......
......@@ -19,14 +19,10 @@ append_source_files(SOURCES Utils)
ogs_add_library(ProcessLib ${SOURCES})
target_link_libraries(ProcessLib
PUBLIC BaseLib
MaterialLib
MathLib
MeshGeoToolsLib
MeshLib
NumLib
PRIVATE ParameterLib GitInfoLib)
target_link_libraries(
ProcessLib
PUBLIC BaseLib MaterialLib MathLib MeshGeoToolsLib MeshLib NumLib
PRIVATE ParameterLib GitInfoLib spdlog::spdlog)
if (OGS_BUILD_PROCESS_ComponentTransport
OR OGS_BUILD_PROCESS_RichardsComponentTransport)
......
......@@ -8,13 +8,10 @@ ogs_add_library(ProcessLibSourceTermPython
target_compile_definitions(ProcessLibSourceTermPython PUBLIC OGS_USE_PYTHON)
target_link_libraries(ProcessLibSourceTermPython
PUBLIC BaseLib
MathLib
MeshLib
NumLib
${Python3_LIBRARIES}
PRIVATE pybind11::pybind11)
target_link_libraries(
ProcessLibSourceTermPython
PUBLIC BaseLib MathLib MeshLib NumLib ${Python3_LIBRARIES}
PRIVATE pybind11::pybind11 spdlog::spdlog)
# For the embedded Python module
ogs_add_library(ProcessLibSourceTermPythonModule PythonSourceTermModule.cpp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment