Skip to content
Snippets Groups Projects
Commit 9812ed82 authored by Lars Bilke's avatar Lars Bilke
Browse files
parent f03c767f
No related branches found
No related tags found
No related merge requests found
...@@ -32,6 +32,7 @@ target_link_libraries( ...@@ -32,6 +32,7 @@ target_link_libraries(
$<$<BOOL:${OGS_BUILD_GUI}>:QtBase> $<$<BOOL:${OGS_BUILD_GUI}>:QtBase>
$<$<TARGET_EXISTS:shp>:shp> $<$<TARGET_EXISTS:shp>:shp>
$<$<TARGET_EXISTS:SwmmInterface>:SwmmInterface> $<$<TARGET_EXISTS:SwmmInterface>:SwmmInterface>
Boost::dynamic_bitset
PRIVATE MeshLib MeshToolsLib GitInfoLib PRIVATE MeshLib MeshToolsLib GitInfoLib
) )
......
...@@ -10,7 +10,8 @@ ogs_add_library(BaseLib GENERATE_EXPORT_HEADER ${SOURCES}) ...@@ -10,7 +10,8 @@ ogs_add_library(BaseLib GENERATE_EXPORT_HEADER ${SOURCES})
target_link_libraries( target_link_libraries(
BaseLib BaseLib
PUBLIC Boost::headers PUBLIC Boost::algorithm
Boost::property_tree
spdlog spdlog
tclap tclap
$<$<BOOL:${MSVC}>:WinMM> # needed for timeGetTime $<$<BOOL:${MSVC}>:WinMM> # needed for timeGetTime
......
...@@ -38,7 +38,7 @@ ogs_add_library(MaterialLib GENERATE_EXPORT_HEADER ${SOURCES}) ...@@ -38,7 +38,7 @@ ogs_add_library(MaterialLib GENERATE_EXPORT_HEADER ${SOURCES})
target_link_libraries( target_link_libraries(
MaterialLib PUBLIC BaseLib Eigen3::Eigen MaterialLib_SolidModels MaterialLib PUBLIC BaseLib Eigen3::Eigen MaterialLib_SolidModels
MaterialLib_FractureModels MaterialLib_FractureModels
PRIVATE MathLib MeshLib ParameterLib exprtk Boost::headers PRIVATE MathLib MeshLib ParameterLib exprtk Boost::math
) )
target_precompile_headers( target_precompile_headers(
......
...@@ -4,4 +4,5 @@ append_source_files(SOURCES Permeability) ...@@ -4,4 +4,5 @@ append_source_files(SOURCES Permeability)
ogs_add_library(MaterialLib_FractureModels GENERATE_EXPORT_HEADER ${SOURCES}) ogs_add_library(MaterialLib_FractureModels GENERATE_EXPORT_HEADER ${SOURCES})
target_link_libraries( target_link_libraries(
MaterialLib_FractureModels PUBLIC MathLib PRIVATE ParameterLib NumLib MaterialLib_FractureModels PUBLIC MathLib PRIVATE ParameterLib NumLib
Boost::math
) )
...@@ -2,8 +2,8 @@ get_source_files(SOURCES) ...@@ -2,8 +2,8 @@ get_source_files(SOURCES)
ogs_add_library(MaterialLib_SolidModels ${SOURCES}) ogs_add_library(MaterialLib_SolidModels ${SOURCES})
target_link_libraries( target_link_libraries(
MaterialLib_SolidModels PUBLIC MathLib PRIVATE ParameterLib MaterialLib_SolidModels PUBLIC MathLib Boost::math PRIVATE ParameterLib
NumLib NumLib
) )
if(OGS_USE_MFRONT) if(OGS_USE_MFRONT)
...@@ -14,5 +14,7 @@ if(OGS_USE_MFRONT) ...@@ -14,5 +14,7 @@ if(OGS_USE_MFRONT)
) )
endif() endif()
target_precompile_headers(MaterialLib_SolidModels PRIVATE [["BaseLib/Error.h"]] target_precompile_headers(
[["BaseLib/ConfigTree.h"]] [["BaseLib/Logging.h"]] <Eigen/Core>) MaterialLib_SolidModels PRIVATE [["BaseLib/Error.h"]]
[["BaseLib/ConfigTree.h"]] [["BaseLib/Logging.h"]] <Eigen/Core>
)
...@@ -13,8 +13,7 @@ ogs_add_library(MaterialLib_SolidModels_MFront ${SOURCES}) ...@@ -13,8 +13,7 @@ ogs_add_library(MaterialLib_SolidModels_MFront ${SOURCES})
target_link_libraries( target_link_libraries(
MaterialLib_SolidModels_MFront PUBLIC BaseLib NumLib MFrontGenericInterface MaterialLib_SolidModels_MFront PUBLIC BaseLib NumLib MFrontGenericInterface
Boost::headers PRIVATE MathLib MeshLib PRIVATE MathLib MeshLib ParameterLib
ParameterLib
) )
target_include_directories( target_include_directories(
MaterialLib_SolidModels_MFront PUBLIC ThirdParty/MGIS/include MaterialLib_SolidModels_MFront PUBLIC ThirdParty/MGIS/include
......
...@@ -19,8 +19,8 @@ ogs_add_library(NumLib GENERATE_EXPORT_HEADER ${SOURCES}) ...@@ -19,8 +19,8 @@ ogs_add_library(NumLib GENERATE_EXPORT_HEADER ${SOURCES})
set_target_properties(NumLib PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(NumLib PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries( target_link_libraries(
NumLib PUBLIC BaseLib GeoLib MathLib MeshLib $<$<TARGET_EXISTS:petsc>:petsc> NumLib PUBLIC BaseLib GeoLib MathLib MeshLib
Boost::headers $<$<TARGET_EXISTS:petsc>:petsc>
) )
target_precompile_headers( target_precompile_headers(
......
...@@ -18,18 +18,19 @@ append_source_files(SOURCES Output) ...@@ -18,18 +18,19 @@ append_source_files(SOURCES Output)
append_source_files(SOURCES Utils) append_source_files(SOURCES Utils)
append_source_files(SOURCES Reflection) append_source_files(SOURCES Reflection)
append_source_files(SOURCES Graph) append_source_files(SOURCES Graph)
### For processes that contains both hydraulical process and mechanical process # For processes that contains both hydraulical process and mechanical process
# Define a function to check if enabled_processes contains LIE, HydroMechanics, # Define a function to check if enabled_processes contains LIE, HydroMechanics,
# ThermoHydroMechanics, RichardsMechanics, or ThermoRichardsMechanics # ThermoHydroMechanics, RichardsMechanics, or ThermoRichardsMechanics
function(check_enabled_processes contains_hm_process) function(check_enabled_processes contains_hm_process)
set(${contains_hm_process} FALSE PARENT_SCOPE) set(${contains_hm_process} FALSE PARENT_SCOPE)
foreach(process ${_enabled_processes}) foreach(process ${_enabled_processes})
if(process STREQUAL "LIE" if(process STREQUAL "LIE"
OR process STREQUAL "HydroMechanics" OR process STREQUAL "HydroMechanics"
OR process STREQUAL "ThermoHydroMechanics" OR process STREQUAL "ThermoHydroMechanics"
OR process STREQUAL "RichardsMechanics" OR process STREQUAL "RichardsMechanics"
OR process STREQUAL "TH2M" OR process STREQUAL "TH2M"
OR process STREQUAL "ThermoRichardsMechanics") OR process STREQUAL "ThermoRichardsMechanics"
)
set(${contains_hm_process} TRUE PARENT_SCOPE) set(${contains_hm_process} TRUE PARENT_SCOPE)
return() return()
endif() endif()
...@@ -46,17 +47,15 @@ add_subdirectory(BoundaryConditionAndSourceTerm/Python) ...@@ -46,17 +47,15 @@ add_subdirectory(BoundaryConditionAndSourceTerm/Python)
target_link_libraries( target_link_libraries(
ProcessLib ProcessLib
PUBLIC PUBLIC BaseLib
BaseLib MaterialLib
MaterialLib MathLib
MathLib MeshGeoToolsLib
MeshGeoToolsLib MeshLib
MeshLib NumLib
NumLib range-v3
Boost::headers $<$<TARGET_EXISTS:petsc>:petsc>
range-v3 ProcessLibBoundaryConditionAndSourceTermPython
$<$<TARGET_EXISTS:petsc>:petsc>
ProcessLibBoundaryConditionAndSourceTermPython
PRIVATE ParameterLib GitInfoLib $<$<TARGET_EXISTS:InSituLib>:InSituLib> PRIVATE ParameterLib GitInfoLib $<$<TARGET_EXISTS:InSituLib>:InSituLib>
) )
......
get_source_files(SOURCES) get_source_files(SOURCES)
ogs_add_library(LIECommon ${SOURCES}) ogs_add_library(LIECommon ${SOURCES})
target_link_libraries(LIECommon PUBLIC MeshLib) target_link_libraries(LIECommon PUBLIC MeshLib PRIVATE Boost::math)
...@@ -112,7 +112,7 @@ target_link_libraries( ...@@ -112,7 +112,7 @@ target_link_libraries(
TestInfoLib TestInfoLib
VTK::FiltersGeneral VTK::FiltersGeneral
VTK::FiltersSources VTK::FiltersSources
Boost::headers # TODO move OGSMFrontThermodynamicForcesView to MathLib? Boost::math # TODO move OGSMFrontThermodynamicForcesView to MathLib?
$<$<TARGET_EXISTS:LIE>:LIE> $<$<TARGET_EXISTS:LIE>:LIE>
$<$<TARGET_EXISTS:TH2M>:TH2M> $<$<TARGET_EXISTS:TH2M>:TH2M>
$<$<AND:$<BOOL:${OGS_USE_PETSC}>,$<TARGET_EXISTS:MPI::MPI_CXX>>:MPI::MPI_CXX> $<$<AND:$<BOOL:${OGS_USE_PETSC}>,$<TARGET_EXISTS:MPI::MPI_CXX>>:MPI::MPI_CXX>
......
ogs_add_executable(xdmfdiff xdmfdiff.cpp) ogs_add_executable(xdmfdiff xdmfdiff.cpp)
target_link_libraries(xdmfdiff OgsXdmf GitInfoLib tclap) target_link_libraries(xdmfdiff OgsXdmf GitInfoLib tclap Boost::range)
install(PROGRAMS $<TARGET_FILE:xdmfdiff> DESTINATION bin) install(PROGRAMS $<TARGET_FILE:xdmfdiff> DESTINATION bin)
...@@ -193,13 +193,22 @@ endif() ...@@ -193,13 +193,22 @@ endif()
if(GUIX_BUILD) if(GUIX_BUILD)
find_package(Boost REQUIRED) find_package(Boost REQUIRED)
else() else()
# Boost libraries used by ogs, can be linked with Boost::[lib_name]
set(BOOST_INCLUDE_LIBRARIES
math
property_tree
algorithm
smart_ptr
tokenizer
assign
dynamic_bitset
range
)
CPMFindPackage( CPMFindPackage(
NAME Boost NAME Boost
VERSION ${ogs.minimum_version.boost} VERSION ${ogs.minimum_version.boost}
URL https://github.com/boostorg/boost/releases/download/boost-${ogs.minimum_version.boost}/boost-${ogs.minimum_version.boost}.tar.xz URL https://github.com/boostorg/boost/releases/download/boost-${ogs.minimum_version.boost}/boost-${ogs.minimum_version.boost}.tar.xz
OPTIONS OPTIONS "BOOST_ENABLE_CMAKE ON"
"BOOST_ENABLE_CMAKE ON"
"BOOST_INCLUDE_LIBRARIES algorithm\\\;math\\\;multi_index\\\;property_tree\\\;smart_ptr"
) )
endif() endif()
...@@ -402,15 +411,16 @@ if((OGS_BUILD_TESTING OR OGS_BUILD_UTILS) AND NOT GUIX_BUILD) ...@@ -402,15 +411,16 @@ if((OGS_BUILD_TESTING OR OGS_BUILD_UTILS) AND NOT GUIX_BUILD)
OgsXdmf SYSTEM PUBLIC ${xdmf_SOURCE_DIR} ${xdmf_BINARY_DIR} OgsXdmf SYSTEM PUBLIC ${xdmf_SOURCE_DIR} ${xdmf_BINARY_DIR}
) )
target_link_libraries(OgsXdmf Boost::headers) target_link_libraries(OgsXdmf Boost::tokenizer)
target_include_directories( target_include_directories(
OgsXdmfCore SYSTEM PUBLIC ${xdmf_SOURCE_DIR}/core OgsXdmfCore SYSTEM PUBLIC ${xdmf_SOURCE_DIR}/core
${xdmf_BINARY_DIR}/core ${xdmf_BINARY_DIR}/core
PRIVATE ${xdmf_SOURCE_DIR}/CMake/VersionSuite PRIVATE ${xdmf_SOURCE_DIR}/CMake/VersionSuite
) )
target_link_libraries( target_link_libraries(
OgsXdmfCore PUBLIC Boost::headers LibXml2::LibXml2 OgsXdmfCore PUBLIC LibXml2::LibXml2 ${HDF5_LIBRARIES} Boost::variant
${HDF5_LIBRARIES} Boost::smart_ptr
PRIVATE Boost::tokenizer Boost::assign Boost::algorithm
) )
set_target_properties( set_target_properties(
......
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