cURL / Mailing Lists / curl-library / Single Mail

curl-library

[PATCH] CMake // windows build fix

From: Sergei Nikulov <sergey.nikulov_at_gmail.com>
Date: Wed, 24 Dec 2014 01:28:50 +0400

Hello folks!

Curl cmake build was regressed for MSVC since some past re-factoring.

The issue related to winsock2 detection after openssl already found (it
will include windows.h first).
In this case - winsock2 check will fail and marked as not found (issue
described here
http://stackoverflow.com/questions/1372480/c-redefinition-header-files).

I've solve this issue by explicit definition -D_WINSOCKAPI_ in
CMAKE_REQUIRED_DEFINITIONS for WIN32 build generation.
Also I've fixed tools_hugehelp.c generation using "cmake -E echo" command.

Could you please review and integrate?
Thank you.

Github pull request: https://github.com/bagder/curl/pull/131

-- 
Best Regards,
Sergei Nikulov


-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html

Received on 2014-12-23