Revert "Move new config to config.h.cmake"

This reverts commit 2951ebb4e7.

cmake/ConfigureCompiler.cmake

@@ -55,6 +55,11 @@ find_package(Threads REQUIRED)
 include_directories(${CMAKE_SOURCE_DIR})
 include_directories(${CMAKE_BINARY_DIR})
 
+if(WIN32)
+  add_definitions(-DBOOST_USE_WINDOWS_H)
+  add_definitions(-DWIN32_LEAN_AND_MEAN)
+endif()
+
 if (USE_CCACHE)
   FIND_PROGRAM(CCACHE_FOUND "ccache")
   if(CCACHE_FOUND)
@@ -94,6 +99,7 @@ if(WIN32)
     string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
   endif()
   add_compile_options(/W0 /EHsc /bigobj $<$<CONFIG:Release>:/Zi> /MP /FC /Gm-)
+  add_compile_definitions(NOMINMAX)
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
 else()

flow/config.h.cmake

@@ -6,13 +6,10 @@
 #endif // FDB_RELEASE
 #cmakedefine OPEN_FOR_IDE
 #ifdef WIN32
-# define BOOST_USE_WINDOWS_H
-# define WIN32_LEAN_AND_MEAN
 # define _WIN32_WINNT ${WINDOWS_TARGET}
 # define WINVER ${WINDOWS_TARGET}
 # define NTDDI_VERSION 0x05020000
 # define BOOST_ALL_NO_LIB
-# define NOMINMAX
 #else
 # cmakedefine USE_ASAN
 # cmakedefine USE_MSAN