From 8ce92b13d3416ec479619d24dd384ec9ee88f19c Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Mon, 8 Feb 2021 20:37:26 +0100 Subject: [PATCH] [CMake] Cleanup, removed generate_export_header() calls. Are already called in `ogs_add_library()`. --- ChemistryLib/CMakeLists.txt | 3 --- MaterialLib/CMakeLists.txt | 3 --- ParameterLib/CMakeLists.txt | 4 ---- 3 files changed, 10 deletions(-) diff --git a/ChemistryLib/CMakeLists.txt b/ChemistryLib/CMakeLists.txt index 49fdbaba980..6036f447944 100644 --- a/ChemistryLib/CMakeLists.txt +++ b/ChemistryLib/CMakeLists.txt @@ -7,9 +7,6 @@ append_source_files(SOURCES Common) # Create the library ogs_add_library(ChemistryLib ${SOURCES}) -include(GenerateExportHeader) -generate_export_header(ChemistryLib) - target_link_libraries(ChemistryLib PUBLIC iphreeqc PRIVATE NumLib spdlog::spdlog) # See https://github.com/ufz/ogs/pull/2982#issuecomment-641086788 diff --git a/MaterialLib/CMakeLists.txt b/MaterialLib/CMakeLists.txt index 8b728b66e16..30cf963c001 100644 --- a/MaterialLib/CMakeLists.txt +++ b/MaterialLib/CMakeLists.txt @@ -37,9 +37,6 @@ endif() ogs_add_library(MaterialLib ${SOURCES}) -include(GenerateExportHeader) -generate_export_header(MaterialLib) -target_include_directories(MaterialLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) if(OGS_USE_MFRONT) target_compile_definitions(MaterialLib PUBLIC OGS_USE_MFRONT) endif() diff --git a/ParameterLib/CMakeLists.txt b/ParameterLib/CMakeLists.txt index d2f0d3a1995..41840f991fc 100644 --- a/ParameterLib/CMakeLists.txt +++ b/ParameterLib/CMakeLists.txt @@ -1,10 +1,6 @@ get_source_files(SOURCES) ogs_add_library(ParameterLib ${SOURCES}) -include(GenerateExportHeader) -generate_export_header(ParameterLib) -target_include_directories(ParameterLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) - target_link_libraries(ParameterLib PUBLIC MathLib PRIVATE BaseLib exprtk MeshLib spdlog::spdlog -- GitLab