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]4c5307b456
[2]aec7c5a87c
Reviewed-by: Daniel Stenberg Assisted-by: Marcel Raad Closes #9726
This commit is contained in:
Родитель
67d88626d4
Коммит
86f2d8f67f
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
16
appveyor.yml
16
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
|
||||
|
|
Загрузка…
Ссылка в новой задаче