luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: fix HAVE_ATOMIC/HAVE_STDATOMIC pre-fill for clang-cl

Browse Source 
`HAVE_ATOMIC` and `HAVE_STDATOMIC` is available in clang-cl builds.
Adjust the pre-filled values accordingly.

Detected by a temporary job comparing pre-filled and actual values
on AppVeyor CI:
https://ci.appveyor.com/project/curlorg/curl/builds/51506692/job/2v8qrytgdnlah348#L416

Closes #16313
This commit is contained in:
Viktor Szakats 2025-02-13 02:56:11 +01:00
parent de0693f249
commit d550966bf8
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMake/win32-cache.cmake
View File

@ -52,14 +52,6 @@ if(MINGW)
set(HAVE_STRTOK_R 0) set(HAVE_STRTOK_R 0)
endif() endif()
endif() endif()
if((CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9) OR
(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6))
set(HAVE_STDATOMIC_H 1)
set(HAVE_ATOMIC 1)
else()
set(HAVE_STDATOMIC_H 0)
set(HAVE_ATOMIC 0)
endif()
else() else()
set(HAVE_LIBGEN_H 0) set(HAVE_LIBGEN_H 0)
set(HAVE_FTRUNCATE 0) set(HAVE_FTRUNCATE 0)
@ -73,7 +65,6 @@ else()
if(MSVC) if(MSVC)
set(HAVE_UNISTD_H 0) set(HAVE_UNISTD_H 0)
set(HAVE_STDDEF_H 1) # detected by CMake internally in check_type_size() set(HAVE_STDDEF_H 1) # detected by CMake internally in check_type_size()
set(HAVE_STDATOMIC_H 0)
if(MSVC_VERSION GREATER_EQUAL 1600) if(MSVC_VERSION GREATER_EQUAL 1600)
set(HAVE_STDINT_H 1) # detected by CMake internally in check_type_size() set(HAVE_STDINT_H 1) # detected by CMake internally in check_type_size()
else() else()
@ -95,10 +86,19 @@ else()
set(HAVE_BASENAME 0) set(HAVE_BASENAME 0)
set(HAVE_STRTOK_R 0) set(HAVE_STRTOK_R 0)
set(HAVE_FILE_OFFSET_BITS 0) set(HAVE_FILE_OFFSET_BITS 0)
set(HAVE_ATOMIC 0)
endif() endif()
endif() endif()
if((CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9) OR
(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6))
# MinGW or clang-cl
set(HAVE_STDATOMIC_H 1)
set(HAVE_ATOMIC 1)
else()
set(HAVE_STDATOMIC_H 0)
set(HAVE_ATOMIC 0)
endif()
# Available in Windows XP and newer # Available in Windows XP and newer
set(HAVE_GETADDRINFO 1) set(HAVE_GETADDRINFO 1)
set(HAVE_FREEADDRINFO 1) set(HAVE_FREEADDRINFO 1)