factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix UWP build

Browse Source 
- Do not set _WIN32_WINNT to enable VirtualAllocFromApp
- Disable tlstest since SetHandleInformation is not supported on UWP
This commit is contained in:
kinichiro 2021-05-29 20:23:04 +09:00
parent 31ef9ade60
commit b25111c22d
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -116,8 +116,11 @@ if(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-D_CRT_DEPRECATED_NO_WARNINGS) add_definitions(-D_CRT_DEPRECATED_NO_WARNINGS)
add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS) 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(-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) set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt)
endif() endif()

30
tests/CMakeLists.txt
View File

@ -512,22 +512,24 @@ target_link_libraries(tlslegacytest ${OPENSSL_LIBS})
add_test(tlslegacytest tlslegacytest) add_test(tlslegacytest tlslegacytest)
# tlstest # tlstest
set(TLSTEST_SRC tlstest.c) if(NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
check_function_exists(pipe2 HAVE_PIPE2) set(TLSTEST_SRC tlstest.c)
if(HAVE_PIPE2) check_function_exists(pipe2 HAVE_PIPE2)
add_definitions(-DHAVE_PIPE2) if(HAVE_PIPE2)
else() add_definitions(-DHAVE_PIPE2)
set(TLSTEST_SRC ${TLSTEST_SRC} compat/pipe2.c) else()
endif() set(TLSTEST_SRC ${TLSTEST_SRC} compat/pipe2.c)
endif()
add_executable(tlstest ${TLSTEST_SRC}) add_executable(tlstest ${TLSTEST_SRC})
target_link_libraries(tlstest ${LIBTLS_LIBS}) target_link_libraries(tlstest ${LIBTLS_LIBS})
if(NOT MSVC) if(NOT MSVC)
add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.sh) add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.sh)
else() else()
add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.bat $<TARGET_FILE:tlstest>) 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() endif()
set_tests_properties(tlstest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
# tls_ext_alpn # tls_ext_alpn
if(NOT BUILD_SHARED_LIBS) if(NOT BUILD_SHARED_LIBS)