Skip to content
Snippets Groups Projects
Commit 29bdc1a4 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

Revert "cmake: check atomic for `RISC-V` architecture"

Reason for partial revert:
Adding the atomic library is meant by CheckAtomic
to be automatic through CMAKE_REQUIRED_LIBRARIES.
parent e0d32e80
No related branches found
No related tags found
No related merge requests found
...@@ -320,9 +320,6 @@ if (OPENDHT_STATIC) ...@@ -320,9 +320,6 @@ if (OPENDHT_STATIC)
PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_STATIC_LIBRARIES} PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_STATIC_LIBRARIES}
${Jsoncpp_STATIC_LIBRARIES} ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY} ${Jsoncpp_STATIC_LIBRARIES} ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY}
${OPENSSL_STATIC_LIBRARIES}) ${OPENSSL_STATIC_LIBRARIES})
if (NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
target_link_libraries(opendht-static PUBLIC atomic)
endif ()
else () else ()
if (OPENDHT_TOOLS) if (OPENDHT_TOOLS)
function (add_obj_lib name libfile) function (add_obj_lib name libfile)
...@@ -396,9 +393,6 @@ if (OPENDHT_SHARED) ...@@ -396,9 +393,6 @@ if (OPENDHT_SHARED)
PRIVATE ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES} PRIVATE ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES}
${Jsoncpp_LIBRARIES} ${Jsoncpp_LIBRARIES}
${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY} ${argon2_LIBRARIES}) ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY} ${argon2_LIBRARIES})
if (NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
target_link_libraries(opendht PUBLIC atomic)
endif ()
endif () endif ()
install (TARGETS opendht DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht) install (TARGETS opendht DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
...@@ -503,9 +497,6 @@ if (OPENDHT_TESTS) ...@@ -503,9 +497,6 @@ if (OPENDHT_TESTS)
${GNUTLS_LIBRARIES} ${GNUTLS_LIBRARIES}
${Jsoncpp_LIBRARIES} ${Jsoncpp_LIBRARIES}
) )
if (NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
target_link_libraries(opendht_unit_tests atomic)
endif ()
if (OPENDHT_PROXY_OPENSSL) if (OPENDHT_PROXY_OPENSSL)
target_link_libraries(opendht_unit_tests ${OPENSSL_LIBRARIES}) target_link_libraries(opendht_unit_tests ${OPENSSL_LIBRARIES})
endif() endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment