From 7c478cad57cda3db4819f0ff37c88ee9ed11cad4 Mon Sep 17 00:00:00 2001 From: Jakub Zakrzewski Date: Wed, 16 Sep 2015 17:27:13 +0200 Subject: CMake: Put "winsock2.h" before "windows.h" during configure checks "windows.h" includes "winsock.h" what causes many redefinition errors if "winsock2.h" is included afterwards and can cause build to fail. --- CMake/OtherTests.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMake') diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake index 4f07f2251..d59949871 100644 --- a/CMake/OtherTests.cmake +++ b/CMake/OtherTests.cmake @@ -10,8 +10,8 @@ endmacro(add_header_include) set(signature_call_conv) if(HAVE_WINDOWS_H) - add_header_include(HAVE_WINDOWS_H "windows.h") add_header_include(HAVE_WINSOCK2_H "winsock2.h") + add_header_include(HAVE_WINDOWS_H "windows.h") add_header_include(HAVE_WINSOCK_H "winsock.h") set(_source_epilogue "${_source_epilogue}\n#ifndef WIN32_LEAN_AND_MEAN\n#define WIN32_LEAN_AND_MEAN\n#endif") -- cgit v1.2.3