Minor fixes for windows install

LuaDist · Feb 15, 2014 · b1c6034 · b1c6034
1 parent af63e22
commit b1c6034
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 90 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,6 +18,14 @@ add_definitions ( -D_REENTRANT -D_THREAD_SAFE )
 if ( WIN32 )
   set ( ZMQ_PLATFORM ZMQ_HAVE_WINDOWS )
   set ( LIBS Ws2_32 )
+  add_definitions(
+  	-DWIN32
+	-DDLL_EXPORT
+# NB: May require tweaking for highly connected applications.
+	-DFD_SETSIZE=1024
+	-D_CRT_SECURE_NO_WARNINGS
+	-D_WIN32_WINNT=${_zmq_WIN32_WINNT}
+  )
   #TODO? HAVE_MINGW32
 elseif ( CYGWIN )
 set ( ZMQ_PLATFORM ZMQ_HAVE_CYGWIN )
@@ -38,6 +46,8 @@ else ( )
 endif ( )
 
 configure_file ( src/platform.hpp.cmake ${CMAKE_CURRENT_BINARY_DIR}/platform.hpp )
+configure_file( src/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc )
+list ( APPEND ZMQ_SRC ${CMAKE_CURRENT_BINARY_DIR}/version.rc )
 
 add_library ( zmq ${ZMQ_SRC} )
 target_link_libraries ( zmq ${LIBS} )

diff --git a/cmake/Modules/TestZMQVersion.cmake b/cmake/Modules/TestZMQVersion.cmake
diff --git a/cmake/Modules/zmq_version.cpp b/cmake/Modules/zmq_version.cpp
diff --git a/cmake/configure.cmake b/cmake/configure.cmake