Merge pull request #506 from arsenm/master

Fix using wrong name for windows.h check with cmake

Merge pull request #506 from arsenm/master
Fix using wrong name for windows.h check with cmake
470d06bb · Pieter Hintjens · e8cbfac9 · e464a910 · 470d06bb · 470d06bb
Commit 470d06bb authored Jan 27, 2013 by Pieter Hintjens
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

CMakeLists.txt CMakeLists.txt +1 -1

platform.hpp.in builds/cmake/platform.hpp.in +1 -4

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ include(CheckCSourceRuns)
 include(CMakeDependentOption)

 check_include_files(ifaddrs.h ZMQ_HAVE_IFADDRS)
-check_include_files(windows.h HAVE_WINDOWS_H)
+check_include_files(windows.h ZMQ_HAVE_WINDOWS)
 check_include_files(sys/uio.h ZMQ_HAVE_UIO)
 check_include_files(sys/eventfd.h ZMQ_HAVE_EVENTFD)


--- a/builds/cmake/platform.hpp.in
+++ b/builds/cmake/platform.hpp.in
@@ -82,10 +82,7 @@
  #define ZMQ_HAVE_SOLARIS
 #endif

-#if defined(WIN32) || defined(_WIN32)
-  #define ZMQ_HAVE_WINDOWS
-#endif
-
+#cmakedefine ZMQ_HAVE_WINDOWS


 #endif