mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-28 07:58:14 +08:00
Merge pull request #2503 from herbrechtsmeier/msvc
cmake: Remove build/msvc include path to remove file name clash
This commit is contained in:
commit
96e61d9f95
@ -597,7 +597,6 @@ if (MINGW)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
include_directories (include ${CMAKE_CURRENT_BINARY_DIR})
|
||||
set (public_headers include/zmq.h
|
||||
include/zmq_utils.h)
|
||||
|
||||
|
@ -133,7 +133,6 @@ ENDIF (ENABLE_DRAFTS)
|
||||
if(WIN32)
|
||||
add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP)
|
||||
add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
|
||||
include_directories(../builds/msvc)
|
||||
# Same name on 64bit systems
|
||||
link_libraries(Ws2_32.lib)
|
||||
endif()
|
||||
|
Loading…
x
Reference in New Issue
Block a user