added DHT_statistics option + fix depencies

This commit is contained in:
Max Lübke 2021-01-28 14:43:36 +01:00
parent 019f521441
commit 716d996339
No known key found for this signature in database
GPG Key ID: D3201E51647D1199
4 changed files with 22 additions and 12 deletions

View File

@ -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)

View File

@ -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)
target_link_libraries(DHT_Wrapper PRIVATE DHT ${MATH_LIBRARY} ${CRYPTO_LIBRARY} POET_Util)

View File

@ -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)
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)

View File

@ -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)