fix cmake VS2012sp4 compile issue

This commit is contained in:
melo.yao 2015-04-09 01:13:09 +08:00
parent 757e3786f5
commit 65521db008
2 changed files with 11 additions and 4 deletions

View File

@ -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()
endif()

View File

@ -1,7 +1,8 @@
#ifndef SIO_CLIENT_IMPL_H
#define SIO_CLIENT_IMPL_H
#ifdef WIN32
#ifdef _WIN32
#include <cstdint>
#define _WEBSOCKETPP_CPP11_THREAD_
#define BOOST_ALL_NO_LIB
//#define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_