Merge pull request #2503 from herbrechtsmeier/msvc

cmake: Remove build/msvc include path to remove file name clash

Merge pull request #2503 from herbrechtsmeier/msvc
cmake: Remove build/msvc include path to remove file name clash
96e61d9f · Luca Boccassi · GitHub · 926d2d26 · 2f367bdd · 96e61d9f
Commit 96e61d9f authored Apr 05, 2017 by Luca Boccassi Committed by GitHub Apr 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

CMakeLists.txt CMakeLists.txt +0 -1

CMakeLists.txt tests/CMakeLists.txt +0 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)


--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -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()