From 2f367bddf79b4494a8443ae1b42d514134e5050d Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Wed, 5 Apr 2017 09:51:36 +0200 Subject: [PATCH] cmake: Remove build/msvc include path to remove file name clash Remove the `build/msvc` include path from the test project to fix a problem with the order of the include paths. Additionally remove the unnecessary `include_directories` from the master project. Signed-off-by: Stefan Herbrechtsmeier --- CMakeLists.txt | 1 - tests/CMakeLists.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6a7e7de..17759800 100644 --- 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) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1e60ba10..bb292873 100644 --- 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()