Define _WIN32_WINNT using a cmake macro; support move semantics for parameter; remove address from HttpServer; add utility for dumping endpoints.

This commit is contained in:
Adam Gu
2018-01-23 15:52:03 +08:00
parent 2793357da3
commit 2327edbd5d
13 changed files with 121 additions and 48 deletions
+25 -17
View File
@@ -1,19 +1,32 @@
cmake_minimum_required(VERSION 3.0)
project(csoap)
# TODO: Replace with log level.
option(CSOAP_ENABLE_OUTPUT "Enable output for request & response?" OFF)
# See: https://stackoverflow.com/a/40217291
if(WIN32)
macro(get_WIN32_WINNT version)
if(CMAKE_SYSTEM_VERSION)
set(ver ${CMAKE_SYSTEM_VERSION})
string(REGEX MATCH "^([0-9]+).([0-9])" ver ${ver})
string(REGEX MATCH "^([0-9]+)" verMajor ${ver})
# Check for Windows 10, b/c we'll need to convert to hex 'A'.
if("${verMajor}" MATCHES "10")
set(verMajor "A")
string(REGEX REPLACE "^([0-9]+)" ${verMajor} ver ${ver})
endif("${verMajor}" MATCHES "10")
# Remove all remaining '.' characters.
string(REPLACE "." "" ver ${ver})
# Prepend each digit with a zero.
string(REGEX REPLACE "([0-9A-Z])" "0\\1" ver ${ver})
set(${version} "0x${ver}")
endif(CMAKE_SYSTEM_VERSION)
endmacro(get_WIN32_WINNT)
if(CSOAP_ENABLE_OUTPUT)
add_definitions(-DCSOAP_ENABLE_OUTPUT)
endif()
add_definitions(-DUNICODE -D_UNICODE)
if(MSVC)
# Win7 (Boost.Asio needs this)
add_definitions(-D_WIN32_WINNT=0x0601)
endif()
get_WIN32_WINNT(ver)
# E.g., 0x0601 for Win7.
message(STATUS "_WIN32_WINNT=${ver}")
# Asio needs this!
add_definitions(-D_WIN32_WINNT=${ver})
endif(WIN32)
# Boost version: 1.66+
set(Boost_USE_STATIC_LIBS ON)
@@ -25,9 +38,4 @@ endif()
include_directories(${PROJECT_SOURCE_DIR}/src)
if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif()
add_subdirectory(src)