From e753d200c62e1ee30f1d3b5d3eed628192f329ea Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Tue, 29 Mar 2022 07:28:54 +0800
Subject: [PATCH] cmake: fix incorrect variable name
---
CMakeLists.txt | 12 ++++++------
cmake/CheckAtomic.cmake | 1 +
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4289a9c7..6cd7850d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -320,8 +320,8 @@ if (OPENDHT_STATIC)
PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_STATIC_LIBRARIES}
${Jsoncpp_STATIC_LIBRARIES} ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY}
${OPENSSL_STATIC_LIBRARIES})
- if (NOT HAVE_CXX_ATOMICS_RISC_V_WITHOUT_LIB)
- target_link_libraries(opendht-static PUBLIC "atomic")
+ if (NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+ target_link_libraries(opendht-static PUBLIC atomic)
endif ()
else ()
if (OPENDHT_TOOLS)
@@ -396,8 +396,8 @@ if (OPENDHT_SHARED)
PRIVATE ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES}
${Jsoncpp_LIBRARIES}
${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY} ${argon2_LIBRARIES})
- if (NOT HAVE_CXX_ATOMICS_RISC_V_WITHOUT_LIB)
- target_link_libraries(opendht PUBLIC "atomic")
+ if (NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+ target_link_libraries(opendht PUBLIC atomic)
endif ()
endif ()
@@ -503,8 +503,8 @@ if (OPENDHT_TESTS)
${GNUTLS_LIBRARIES}
${Jsoncpp_LIBRARIES}
)
- if (NOT HAVE_CXX_ATOMICS_RISC_V_WITHOUT_LIB)
- target_link_libraries(opendht_unit_tests "atomic")
+ if (NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+ target_link_libraries(opendht_unit_tests atomic)
endif ()
if (OPENDHT_PROXY_OPENSSL)
target_link_libraries(opendht_unit_tests ${OPENSSL_LIBRARIES})
diff --git a/cmake/CheckAtomic.cmake b/cmake/CheckAtomic.cmake
index 42ae8e98..b9ae7e4f 100644
--- a/cmake/CheckAtomic.cmake
+++ b/cmake/CheckAtomic.cmake
@@ -38,6 +38,7 @@ int main() {
set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
endfunction(check_working_cxx_atomics64)
+
# This isn't necessary on MSVC, so avoid command-line switch annoyance
# by only running on GCC-like hosts.
if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
--
GitLab