From 65521db008423cc187a14052eb5d091e54f1eb53 Mon Sep 17 00:00:00 2001 From: "melo.yao" Date: Thu, 9 Apr 2015 01:13:09 +0800 Subject: [PATCH] fix cmake VS2012sp4 compile issue --- CMakeLists.txt | 12 +++++++++--- src/internal/sio_client_impl.h | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d3b1214..64403fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,13 @@ -cmake_minimum_required (VERSION 2.6) +cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) PROJECT(sioclient) set(BOOST_VER "1.55.0" CACHE STRING "boost version" ) set(BOOST_PATH "__boost__" CACHE STRING "boost root path" ) -set(CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++" ) +set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") +set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG") +set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") + + if(${BOOST_PATH} STREQUAL "__boost__" ) set(BOOST_INCLUDE "__boost__" CACHE STRING "boost include path" ) @@ -36,6 +40,8 @@ if(Boost_FOUND) file(GLOB ALL_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h ) MESSAGE(STATUS ${ALL_HEADERS} ) add_library(sioclient STATIC ${ALL_SRC}) + set_property(TARGET sioclient PROPERTY CXX_STANDARD 11) + set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON) target_link_libraries(sioclient ${Boost_LIBRARIES}) INSTALL(FILES ${ALL_HEADERS} DESTINATION "${PROJECT_SOURCE_DIR}/build/include" @@ -43,4 +49,4 @@ if(Boost_FOUND) INSTALL(TARGETS sioclient DESTINATION "${PROJECT_SOURCE_DIR}/build/lib" ) -endif() \ No newline at end of file +endif() diff --git a/src/internal/sio_client_impl.h b/src/internal/sio_client_impl.h index b3f984f..e0c301a 100644 --- a/src/internal/sio_client_impl.h +++ b/src/internal/sio_client_impl.h @@ -1,7 +1,8 @@ #ifndef SIO_CLIENT_IMPL_H #define SIO_CLIENT_IMPL_H -#ifdef WIN32 +#ifdef _WIN32 +#include #define _WEBSOCKETPP_CPP11_THREAD_ #define BOOST_ALL_NO_LIB //#define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_