From 716d9963397d5feb78d3c3f074a09d2b82e89354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20L=C3=BCbke?= Date: Thu, 28 Jan 2021 14:43:36 +0100 Subject: [PATCH] added DHT_statistics option + fix depencies --- src/CMakeLists.txt | 5 +++-- src/DHT/CMakeLists.txt | 19 ++++++++++++++----- src/model/CMakeLists.txt | 8 ++++---- src/util/CMakeLists.txt | 2 +- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b27714365..165efb053 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,7 @@ add_executable(poet kin.cpp) -target_link_libraries(poet PRIVATE POET_Model POET_Util) +target_link_libraries(poet PRIVATE POET_Model POET_Util MPI::MPI_C) +target_compile_definitions(poet PRIVATE OMPI_SKIP_MPICXX) add_subdirectory(DHT) add_subdirectory(model) -add_subdirectory(util) +add_subdirectory(util) \ No newline at end of file diff --git a/src/DHT/CMakeLists.txt b/src/DHT/CMakeLists.txt index 0a0340a7d..6658bf7b6 100644 --- a/src/DHT/CMakeLists.txt +++ b/src/DHT/CMakeLists.txt @@ -1,8 +1,17 @@ -add_library(DHT SHARED DHT.c DHT.h) -target_include_directories(DHT PRIVATE ${MPI_C_INCLUDE_DIRS}) -target_link_libraries(DHT MPI::MPI_C) +add_library(DHT DHT.c DHT.h) +target_include_directories(DHT PUBLIC ${MPI_C_INCLUDE_DIRS}) +target_link_libraries(DHT PRIVATE MPI::MPI_C) target_compile_definitions(DHT PUBLIC OMPI_SKIP_MPICXX) -add_library(DHT_Wrapper STATIC DHT_Wrapper.cpp DHT_Wrapper.h) +set(DHT_Debug FALSE CACHE BOOL "Toggle output of stastic table for each iteration") + +if (DHT_Debug) + target_compile_definitions(DHT PUBLIC DHT_STATISTICS) +endif() + +find_library(MATH_LIBRARY m) +find_library(CRYPTO_LIBRARY crypto) + +add_library(DHT_Wrapper DHT_Wrapper.cpp DHT_Wrapper.h) target_include_directories(DHT_Wrapper PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(DHT_Wrapper DHT m crypto POET_Util) \ No newline at end of file +target_link_libraries(DHT_Wrapper PRIVATE DHT ${MATH_LIBRARY} ${CRYPTO_LIBRARY} POET_Util) \ No newline at end of file diff --git a/src/model/CMakeLists.txt b/src/model/CMakeLists.txt index a2e770c25..955da1094 100644 --- a/src/model/CMakeLists.txt +++ b/src/model/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(POET_Model STATIC ChemSim.cpp ChemSim.h ChemMaster.cpp ChemWorker.cpp TransportSim.cpp Grid.cpp) -target_include_directories(POET_Model PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${MPI_C_INCLUDE_DIRS}) -target_link_libraries(POET_Model POET_Util DHT_Wrapper MPI::MPI_C) -target_compile_definitions(POET_Model PUBLIC OMPI_SKIP_MPICXX) \ No newline at end of file +add_library(POET_Model ChemSim.cpp ChemSim.h ChemMaster.cpp ChemWorker.cpp TransportSim.cpp Grid.cpp) +target_include_directories(POET_Model PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${MPI_C_INCLUDE_DIRS}) +target_link_libraries(POET_Model PRIVATE POET_Util MPI::MPI_C PUBLIC DHT_Wrapper) +target_compile_definitions(POET_Model PRIVATE OMPI_SKIP_MPICXX) \ No newline at end of file diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index ea98f6797..9c1446c2c 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(POET_Util STATIC RRuntime.cpp Parser.cpp) +add_library(POET_Util RRuntime.cpp Parser.cpp) target_include_directories(POET_Util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${R_INCLUDE_DIRS}) target_link_libraries(POET_Util ${R_LIBRARIES}) target_compile_definitions(POET_Util PUBLIC STRICT_R_HEADERS) \ No newline at end of file