@@ -85,7 +85,7 @@ include_directories(${OPENSSL_INCLUDE_DIR})
85
85
86
86
find_package (PkgConfig REQUIRED )
87
87
88
- pkg_search_module (opendht REQUIRED IMPORTED_TARGET opendht )
88
+ pkg_search_module (opendht REQUIRED IMPORTED_TARGET opendht>=3.2 )
89
89
message ("* opendht Include Dir:${opendht_INCLUDEDIR} " )
90
90
message ("* opendht Lib Dir:${opendht_LIBDIR} " )
91
91
include_directories (${opendht_INCLUDE_DIR} )
@@ -123,7 +123,7 @@ link_directories(${nettle_LIBDIR})
123
123
124
124
add_library (${PLEXUS_SHARED} SHARED utils.cpp exec.cpp smime.cpp udp.cpp tcp.cpp email.cpp dht.cpp stun.cpp binder.cpp plexus.cpp )
125
125
target_link_libraries (${PLEXUS_SHARED} PRIVATE ${TUBUS_SHARED} ${WORMHOLE_SHARED} Boost::coroutine OpenSSL::SSL OpenSSL::Crypto PkgConfig::opendht PkgConfig::fmt PkgConfig::libargon2 PkgConfig::GnuTLS PkgConfig::nettle PkgConfig::JsonCpp )
126
- target_compile_definitions (${PLEXUS_SHARED} PRIVATE PLEXUS_EXPORTS OPENDHT_STATIC )
126
+ target_compile_definitions (${PLEXUS_SHARED} PRIVATE PLEXUS_EXPORTS )
127
127
set_target_properties (${PLEXUS_SHARED} PROPERTIES DEBUG_POSTFIX "d" IMPORT_PREFIX "lib" )
128
128
set_target_properties (${PLEXUS_SHARED} PROPERTIES OUTPUT_NAME ${PROJECT_NAME} )
129
129
@@ -133,7 +133,6 @@ set_target_properties(${PLEXUS_STATIC} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
133
133
134
134
add_executable (${PROJECT_NAME} main.cpp $< TARGET_OBJECTS:${PLEXUS_SHARED} > )
135
135
target_link_libraries (${PROJECT_NAME} PRIVATE ${TUBUS_STATIC} ${WORMHOLE_STATIC} Boost::coroutine Boost::program_options OpenSSL::SSL OpenSSL::Crypto PkgConfig::opendht PkgConfig::fmt PkgConfig::libargon2 PkgConfig::GnuTLS PkgConfig::nettle PkgConfig::JsonCpp )
136
- target_compile_definitions (${PROJECT_NAME} PRIVATE OPENDHT_STATIC )
137
136
set_target_properties (${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX "d" )
138
137
139
138
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
@@ -195,7 +194,6 @@ if(BUILD_TESTING)
195
194
tests/exec_tests.cpp
196
195
tests/plexus_tests.cpp )
197
196
target_link_libraries (${PLEXUS_UT} PRIVATE ${PLEXUS_STATIC} ${WORMHOLE_STATIC} ${TUBUS_STATIC} Boost::coroutine Boost::program_options Boost::unit_test_framework OpenSSL::SSL OpenSSL::Crypto PkgConfig::opendht PkgConfig::fmt PkgConfig::libargon2 PkgConfig::GnuTLS PkgConfig::nettle PkgConfig::JsonCpp )
198
- target_compile_definitions (${PLEXUS_UT} PRIVATE OPENDHT_STATIC )
199
197
set_target_properties (${PLEXUS_UT} PROPERTIES DEBUG_POSTFIX "d" )
200
198
201
199
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )