From b25111c22da96c839bad46cfbd49e030a3b03fb2 Mon Sep 17 00:00:00 2001
From: kinichiro <kinichiro.inoguchi@gmail.com>
Date: Sat, 29 May 2021 20:23:04 +0900
Subject: Fix UWP build

- Do not set _WIN32_WINNT to enable VirtualAllocFromApp
- Disable tlstest since SetHandleInformation is not supported on UWP
---
 CMakeLists.txt       |  5 ++++-
 tests/CMakeLists.txt | 30 ++++++++++++++++--------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06d9186..b37b3f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,8 +116,11 @@ if(WIN32)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 	add_definitions(-D_CRT_DEPRECATED_NO_WARNINGS)
 	add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS)
-	add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600)
 	add_definitions(-DCPPFLAGS -DNO_SYSLOG -DNO_CRYPT)
+	add_definitions(-DWIN32_LEAN_AND_MEAN)
+	if(NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+		add_definitions(-D_WIN32_WINNT=0x0600)
+	endif()
 	set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt)
 endif()
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 52acbba..a816751 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -512,22 +512,24 @@ target_link_libraries(tlslegacytest ${OPENSSL_LIBS})
 add_test(tlslegacytest tlslegacytest)
 
 # tlstest
-set(TLSTEST_SRC tlstest.c)
-check_function_exists(pipe2 HAVE_PIPE2)
-if(HAVE_PIPE2)
-	add_definitions(-DHAVE_PIPE2)
-else()
-	set(TLSTEST_SRC ${TLSTEST_SRC} compat/pipe2.c)
-endif()
+if(NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+	set(TLSTEST_SRC tlstest.c)
+	check_function_exists(pipe2 HAVE_PIPE2)
+	if(HAVE_PIPE2)
+		add_definitions(-DHAVE_PIPE2)
+	else()
+		set(TLSTEST_SRC ${TLSTEST_SRC} compat/pipe2.c)
+	endif()
 
-add_executable(tlstest ${TLSTEST_SRC})
-target_link_libraries(tlstest ${LIBTLS_LIBS})
-if(NOT MSVC)
-	add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.sh)
-else()
-	add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.bat $<TARGET_FILE:tlstest>)
+	add_executable(tlstest ${TLSTEST_SRC})
+	target_link_libraries(tlstest ${LIBTLS_LIBS})
+	if(NOT MSVC)
+		add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.sh)
+	else()
+		add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.bat $<TARGET_FILE:tlstest>)
+	endif()
+	set_tests_properties(tlstest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 endif()
-set_tests_properties(tlstest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
 # tls_ext_alpn
 if(NOT BUILD_SHARED_LIBS)
-- 
cgit v1.2.3-55-g6feb