From fbc3202887c9bac236fc1afdd3ea8be787f92579 Mon Sep 17 00:00:00 2001 From: ChaofanChen <chaofan.chen@ufz.de> Date: Sun, 29 Mar 2020 22:23:42 +0200 Subject: [PATCH] [Cmake] Remove ChemistryLib and iphreeqc make for current HeatTransportBHE process. The BHE process is not related to the chemical calculation. So it is not necessary to link the HeatTransportBHE process with the ChemistryLib and iphreeqc while compiling. --- CMakeLists.txt | 3 +-- ProcessLib/CMakeLists.txt | 4 +--- ThirdParty/CMakeLists.txt | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ace38f256e..1a0029f98a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -306,8 +306,7 @@ add_subdirectory(MeshGeoToolsLib) add_subdirectory(NumLib) if(OGS_BUILD_PROCESS_ComponentTransport - OR OGS_BUILD_PROCESS_RichardsComponentTransport - OR OGS_BUILD_PROCESS_HeatTransportBHE) + OR OGS_BUILD_PROCESS_RichardsComponentTransport) add_subdirectory(ChemistryLib) endif() diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt index ce79822dcbe..71ae82110b6 100644 --- a/ProcessLib/CMakeLists.txt +++ b/ProcessLib/CMakeLists.txt @@ -30,9 +30,7 @@ target_link_libraries(ProcessLib PRIVATE ParameterLib GitInfoLib) if (OGS_BUILD_PROCESS_ComponentTransport - OR OGS_BUILD_PROCESS_RichardsComponentTransport - OR OGS_BUILD_PROCESS_RichardsComponentTransport - OR OGS_BUILD_PROCESS_HeatTransportBHE) + OR OGS_BUILD_PROCESS_RichardsComponentTransport) target_link_libraries(ProcessLib PUBLIC ChemistryLib) endif() diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt index 72021c5a00b..d91cfa8db44 100644 --- a/ThirdParty/CMakeLists.txt +++ b/ThirdParty/CMakeLists.txt @@ -10,9 +10,7 @@ option(OGS_USE_OPTIONAL_SUBMODULES "Option for enabling optional submodules" OFF # iphreeqc if (OGS_BUILD_PROCESS_ComponentTransport - OR OGS_BUILD_PROCESS_RichardsComponentTransport - OR OGS_BUILD_PROCESS_RichardsComponentTransport - OR OGS_BUILD_PROCESS_HeatTransportBHE) + OR OGS_BUILD_PROCESS_RichardsComponentTransport) add_subdirectory(iphreeqc) list(APPEND DISABLE_WARNINGS_TARGETS iphreeqc) target_include_directories(iphreeqc SYSTEM PUBLIC -- GitLab