From e52b3e77cf0f63adeabf5955a2f2748316cefd0c Mon Sep 17 00:00:00 2001 From: Luis Diaz Mas Date: Wed, 1 Nov 2017 05:36:42 +0100 Subject: [PATCH] Remove definition -DWIN32_LEAN_AND_MEAN that is already present in config.h --- config/compilerFlags.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/compilerFlags.cmake b/config/compilerFlags.cmake index 3d5c614d..57e91b3e 100644 --- a/config/compilerFlags.cmake +++ b/config/compilerFlags.cmake @@ -115,11 +115,6 @@ if(MSVC) set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/NODEFAULTLIB:MSVCRT") endif() - # Resolving Redefinition Errors Betwen ws2def.h and winsock.h: - # - http://www.zachburlingame.com/2011/05/resolving-redefinition-errors-betwen-ws2def-h-and-winsock-h/ - # - https://stackoverflow.com/questions/11040133/what-does-defining-win32-lean-and-mean-exclude-exactly - add_definitions(-DWIN32_LEAN_AND_MEAN) - if ( EXIV2_WARNINGS_AS_ERRORS ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /WX")