3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-28 16:15:23 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2503 from herbrechtsmeier/msvc

Browse Source 
cmake: Remove build/msvc include path to remove file name clash
This commit is contained in:
Luca Boccassi 2017-04-05 09:28:34 +01:00 committed by GitHub
commit 96e61d9f95
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -597,7 +597,6 @@ if (MINGW)
endif () endif ()
endif () endif ()
include_directories (include ${CMAKE_CURRENT_BINARY_DIR})
set (public_headers include/zmq.h set (public_headers include/zmq.h
include/zmq_utils.h) include/zmq_utils.h)

1
tests/CMakeLists.txt
View File

@ -133,7 +133,6 @@ ENDIF (ENABLE_DRAFTS)
if(WIN32) if(WIN32)
add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP) add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP)
add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS) add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
include_directories(../builds/msvc)
# Same name on 64bit systems # Same name on 64bit systems
link_libraries(Ws2_32.lib) link_libraries(Ws2_32.lib)
endif() endif()