From 906f04f8a2b5c2cac8ffb977ba0a6967822712bd Mon Sep 17 00:00:00 2001 From: Alan Antonuk Date: Sat, 19 Jan 2013 22:35:18 -0500 Subject: FIX: htonll redeclared on Win32 v8 config.h.in didn't include the HAVE_HTONLL, have added this htonll is declared inline in the Winsock2.h header, must use CheckSymbolExists from there. --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index c129316..e0bd31f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,7 @@ endif() include(TestCInline) include(CheckFunctionExists) +include(CheckSymbolExists) include(CheckLibraryExists) include(CMakePushCheckState) @@ -92,7 +93,11 @@ cmake_pop_check_state() cmake_push_check_state() set(CMAKE_REQUIRED_LIBRARIES ${SOCKET_LIBRARIES}) -check_function_exists(htonll HAVE_HTONLL) +if (WIN32) + check_symbol_exists(htonll Winsock2.h HAVE_HTONLL) +else (WIN32) + check_function_exists(htonll HAVE_HTONLL) +endif (WIN32) cmake_pop_check_state() option(REGENERATE_AMQP_FRAMING "Regenerate amqp_framing.h/amqp_framing.c sources (for developer use)" OFF) -- cgit v1.2.1