From 7f44310670cf3d3c903bab8d8356d4255238fb5d Mon Sep 17 00:00:00 2001
From: Pieter Hintjens <ph@imatix.com>
Date: Sat, 24 Aug 2013 08:08:04 +0200
Subject: [PATCH] Revert "fixed compilation - added detection for _WIN32_WINNT"

This reverts commit d1ea5e525e7f8ba886eb4bc72155e6d68dafc269.
---
 CMakeLists.txt                     | 26 ++++++++++----------------
 cmake/Modules/TestZMQVersion.cmake | 25 ++++++++++++++-----------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd423f83..6b21a129 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,22 +210,16 @@ foreach (source ${rc-sources})
 	configure_file(${CMAKE_SOURCE_DIR}/src/${source}.in ${CMAKE_BINARY_DIR}/${source})
 endforeach()
 
-if(WIN32)
-	set(_platform_sp "builds/msvc")
-	if(MINGW)
-		set(_platform_sp "builds/mingw32")
-	endif()
-	add_custom_command(
-		OUTPUT ${CMAKE_SOURCE_DIR}/src/platform.hpp
-		COMMAND ${CMAKE_COMMAND}
-		ARGS	-E
-			copy
-			${CMAKE_SOURCE_DIR}/${_platform_sp}/platform.hpp
-			${CMAKE_SOURCE_DIR}/src/platform.hpp
-		DEPENDS ${CMAKE_SOURCE_DIR}/${_platform_sp}/platform.hpp
-	)
-	list(APPEND sources ${CMAKE_SOURCE_DIR}/src/platform.hpp)
-endif()
+add_custom_command(
+	OUTPUT ${CMAKE_BINARY_DIR}/platform.hpp
+	COMMAND ${CMAKE_COMMAND}
+	ARGS	-E
+		copy
+		${CMAKE_SOURCE_DIR}/builds/msvc/platform.hpp
+		${CMAKE_BINARY_DIR}/platform.hpp
+	DEPENDS ${CMAKE_SOURCE_DIR}/builds/msvc/platform.hpp
+)
+list(APPEND sources ${CMAKE_BINARY_DIR}/platform.hpp)
 
 if (CMAKE_CL_64)
 	set (nsis-template ${CMAKE_SOURCE_DIR}/cmake/NSIS.template64.in)
diff --git a/cmake/Modules/TestZMQVersion.cmake b/cmake/Modules/TestZMQVersion.cmake
index 1c2ed3c8..13cf6967 100644
--- a/cmake/Modules/TestZMQVersion.cmake
+++ b/cmake/Modules/TestZMQVersion.cmake
@@ -1,11 +1,3 @@
-macro(get_WIN32_WINNT version)
-    if (WIN32 AND CMAKE_SYSTEM_VERSION)
-        set(ver ${CMAKE_SYSTEM_VERSION})
-        string(REPLACE "." "" ver ${ver})
-        string(REGEX REPLACE "([0-9])" "0\\1" ver ${ver})
-        set(${version} "0x${ver}")
-    endif()
-endmacro()
 
   MESSAGE(STATUS "Detecting ZMQ")
         SET(TRY_RUN_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/zmq_run.dir)
@@ -32,25 +24,36 @@ endmacro()
           MESSAGE(STATUS "Detecting ZMQ - failed")
         ENDIF()
 
-
-get_WIN32_WINNT(_zmq_WIN32_WINNT)
-
   if(CMAKE_GENERATOR_TOOLSET MATCHES "v120")
     set(_zmq_TOOLSET "-v120")
     set(_zmq_COMPILER "vc120")
+    set(_zmq_WIN32_WINNT "0x0601")
   elseif(CMAKE_GENERATOR_TOOLSET MATCHES "v110_xp")
     set(_zmq_TOOLSET "-v110_xp")
     set(_zmq_COMPILER "vc110")
+    set(_zmq_WIN32_WINNT "0x0501")
   elseif(CMAKE_GENERATOR_TOOLSET MATCHES "v110")
     set(_zmq_TOOLSET "-v110")
     set(_zmq_COMPILER "vc110")
+    set(_zmq_WIN32_WINNT "0x0601")
   elseif(CMAKE_GENERATOR_TOOLSET MATCHES "v100")
     set(_zmq_TOOLSET "-v100")
     set(_zmq_COMPILER "vc100")
+    if(CMAKE_CL_64)
+      set(_zmq_WIN32_WINNT "0x0600")
+    else()
+      set(_zmq_WIN32_WINNT "0x0501")
+    endif()
   elseif(CMAKE_GENERATOR_TOOLSET MATCHES "v90")
     set(_zmq_TOOLSET "-v90")
     set(_zmq_COMPILER "vc90")
+    if(CMAKE_CL_64)
+      set(_zmq_WIN32_WINNT "0x0600")
+    else()
+      set(_zmq_WIN32_WINNT "0x0501")
+    endif()
   else()
     set(_zmq_TOOLSET "")
     set(_zmq_COMPILER "")
+    set(_zmq_WIN32_WINNT "")
   endif()