From e1776894268dbca665f9c69a3e270c1d051dbe9d Mon Sep 17 00:00:00 2001 From: Szabolcs Hubai Date: Sat, 2 Nov 2019 00:39:09 +0100 Subject: [PATCH] cmake: fix test HAVE_CXX_LIBATOMICS64_2ARGS in CheckAtomic module It's no sense to repeat an already failed check. Looks like a copy-paste bug as the HAVE_CXX_LIBATOMICS64_2ARGS test runs again the very same check as the HAVE_LIBATOMIC_2ARGS. Without this change the check obviously fails: -- Performing Test HAVE_LIBATOMIC_2ARGS -- Performing Test HAVE_LIBATOMIC_2ARGS - Failed -- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB -- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed -- Looking for __atomic_load_8 in atomic -- Looking for __atomic_load_8 in atomic - not found -- Performing Test HAVE_CXX_LIBATOMICS64_2ARGS -- Performing Test HAVE_CXX_LIBATOMICS64_2ARGS - Failed CMake Error at cmake/CheckAtomic.cmake:146 (message): Host compiler appears to require libatomic, but cannot find it. Call Stack (most recent call first): CMakeLists.txt:80 (include) With this change the test HAVE_CXX_LIBATOMICS64_2ARGS succeeds: -- Performing Test HAVE_LIBATOMIC_2ARGS -- Performing Test HAVE_LIBATOMIC_2ARGS - Failed -- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB -- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed -- Looking for __atomic_load_8 in atomic -- Looking for __atomic_load_8 in atomic - not found -- Performing Test HAVE_CXX_LIBATOMICS64_2ARGS -- Performing Test HAVE_CXX_LIBATOMICS64_2ARGS - Success -- Performing Test HAVE_CXX_ATOMICS64_WITH_LIB -- Performing Test HAVE_CXX_ATOMICS64_WITH_LIB - Success --- cmake/CheckAtomic.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/CheckAtomic.cmake b/cmake/CheckAtomic.cmake index ce306090..6f8c1900 100644 --- a/cmake/CheckAtomic.cmake +++ b/cmake/CheckAtomic.cmake @@ -132,7 +132,7 @@ if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB) if( NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB ) check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64) if( NOT HAVE_CXX_LIBATOMICS64 ) - check_working_cxx_atomics_2args(HAVE_CXX_LIBATOMICS64_2ARGS) + check_working_cxx_atomics64_2args(HAVE_CXX_LIBATOMICS64_2ARGS) endif() if( HAVE_CXX_LIBATOMICS64 OR HAVE_CXX_LIBATOMICS64_2ARGS ) list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")