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 | |
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
-rw-r--r-- | CMake/Platforms/WindowsCache.cmake | 1 | ||||
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | appveyor.yml | 16 |
3 files changed, 9 insertions, 9 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) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ee96db6b..a9587be4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1117,7 +1117,6 @@ foreach(CURL_TEST HAVE_IOCTL_FIONBIO HAVE_IOCTL_SIOCGIFADDR HAVE_SETSOCKOPT_SO_NONBLOCK - HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID TIME_WITH_SYS_TIME HAVE_O_NONBLOCK HAVE_GETHOSTBYNAME_R_3 diff --git a/appveyor.yml b/appveyor.yml index 99208f8e9..1709823f8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -74,7 +74,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "!1139 !1501" + DISABLED_TESTS: "!1139 !1501 ~1056" ADD_PATH: "C:\\msys64\\usr\\bin" - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022" BUILD_SYSTEM: CMake @@ -87,7 +87,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "~571 !1139 !1501 " + DISABLED_TESTS: "~571 !1139 !1501 ~1056" ADD_PATH: "C:\\msys64\\usr\\bin" - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022" BUILD_SYSTEM: CMake @@ -100,7 +100,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "~571 !1139 !1501" + DISABLED_TESTS: "~571 !1139 !1501 ~1056" ADD_PATH: "C:\\msys64\\usr\\bin" - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022" BUILD_SYSTEM: CMake @@ -113,7 +113,7 @@ environment: HTTP_ONLY: ON TESTING: ON SHARED: OFF - DISABLED_TESTS: "!1139 !1501" + DISABLED_TESTS: "!1139 !1501 ~1056" ADD_PATH: "C:\\msys64\\usr\\bin" # generated CMake-based MSYS Makefiles builds (mingw cross-compiling) - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" @@ -126,7 +126,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "!1139 !1501" + DISABLED_TESTS: "!1139 !1501 ~1056" ADD_PATH: "C:\\mingw-w64\\x86_64-8.1.0-posix-seh-rt_v6-rev0\\mingw64\\bin;C:\\msys64\\usr\\bin" MSYS2_ARG_CONV_EXCL: "/*" BUILD_OPT: -k @@ -140,7 +140,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "!1139 !1501" + DISABLED_TESTS: "!1139 !1501 ~1056" ADD_PATH: "C:\\mingw-w64\\x86_64-7.2.0-posix-seh-rt_v5-rev1\\mingw64\\bin;C:\\msys64\\usr\\bin" MSYS2_ARG_CONV_EXCL: "/*" BUILD_OPT: -k @@ -154,7 +154,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "!1139 !1501" + DISABLED_TESTS: "!1139 !1501 ~1056" ADD_PATH: "C:\\mingw-w64\\i686-6.3.0-posix-dwarf-rt_v5-rev1\\mingw32\\bin;C:\\msys64\\usr\\bin" MSYS2_ARG_CONV_EXCL: "/*" BUILD_OPT: -k @@ -168,7 +168,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "!1139 !1501" + DISABLED_TESTS: "!1139 !1501 ~1056" ADD_PATH: "C:\\MinGW\\bin;C:\\msys64\\usr\\bin" MSYS2_ARG_CONV_EXCL: "/*" BUILD_OPT: -k |