3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-07 21:05:34 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2599 from ibancg/master

Browse Source 
Problem: cannot cross-compile with Mingw-w64
This commit is contained in:
Luca Boccassi 2017-06-14 15:28:02 +01:00 committed by GitHub
commit 35fce88fee
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -183,7 +183,7 @@ include (CheckCXXSymbolExists)
check_include_files (ifaddrs.h ZMQ_HAVE_IFADDRS)
check_include_files (windows.h ZMQ_HAVE_WINDOWS)
if( ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore" AND ${CMAKE_SYSTEM_VERSION} STREQUAL "10.0")
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND CMAKE_SYSTEM_VERSION STREQUAL "10.0")
SET(ZMQ_HAVE_WINDOWS_UWP ON)
ADD_DEFINITIONS(-D_WIN32_WINNT=_WIN32_WINNT_WIN10)
endif()

2
tests/CMakeLists.txt
View File

@ -134,7 +134,7 @@ if(WIN32)
add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP)
add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
# Same name on 64bit systems
link_libraries(Ws2_32.lib)
link_libraries(ws2_32.lib)
endif()
# add library and include dirs for all targets