diff options
| author | Viktor Szakats <commit@vsz.me> | 2022-10-14 19:06:37 +0000 |
|---|---|---|
| committer | Viktor Szakats <commit@vsz.me> | 2022-10-14 19:07:16 +0000 |
| commit | 86f2d8f67f0e4255128e448e531d91aec4cfd6be (patch) | |
| tree | 09fc9117c44ca25ec6bed3c79266ff89071c9be8 /CMake | |
| parent | 67d88626d44ec04b9e11dca4cfbf62cd29fe9781 (diff) | |
| download | curl-86f2d8f67f0e4255128e448e531d91aec4cfd6be.tar.gz | |
cmake: set HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID on Windows
`lib/config-win32.h` enables this configuration option unconditionally.
Make it apply to CMake builds as well.
While here, delete a broken check for
`HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID` from `CMakeLists.txt`. This came with
the initial commit [1], but did not include the actual verification code
inside `CMake/CurlTests.c`, so it always failed. A later commit [2]
added a second test, for non-Windows platforms.
Enabling this flag causes test 1056 to fail with CMake builds, as they
do with autotools builds. Let's apply the same solution and ignore the
results here as well.
[1] 4c5307b45655ba75ab066564afdc0c111a8b9291
[2] aec7c5a87c8482b6ddffa352d7d220698652262e
Reviewed-by: Daniel Stenberg
Assisted-by: Marcel Raad
Closes #9726
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/Platforms/WindowsCache.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMake/Platforms/WindowsCache.cmake b/CMake/Platforms/WindowsCache.cmake index dc4675368..9a513bb6c 100644 --- a/CMake/Platforms/WindowsCache.cmake +++ b/CMake/Platforms/WindowsCache.cmake @@ -64,6 +64,7 @@ if(NOT UNIX) set(HAVE_GETTIMEOFDAY 0) set(HAVE_CLOSESOCKET 1) set(HAVE_SIGSETJMP 0) + set(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1) set(HAVE_GETPASS_R 0) set(HAVE_GETPWUID 0) set(HAVE_GETEUID 0) |