Skip to content

Commit 65521db

Browse files
committed
fix cmake VS2012sp4 compile issue
1 parent 757e378 commit 65521db

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

CMakeLists.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
cmake_minimum_required (VERSION 2.6)
1+
cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
22
PROJECT(sioclient)
33

44
set(BOOST_VER "1.55.0" CACHE STRING "boost version" )
55
set(BOOST_PATH "__boost__" CACHE STRING "boost root path" )
6-
set(CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++" )
6+
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
7+
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG")
8+
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
9+
10+
711

812
if(${BOOST_PATH} STREQUAL "__boost__" )
913
set(BOOST_INCLUDE "__boost__" CACHE STRING "boost include path" )
@@ -36,11 +40,13 @@ if(Boost_FOUND)
3640
file(GLOB ALL_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h )
3741
MESSAGE(STATUS ${ALL_HEADERS} )
3842
add_library(sioclient STATIC ${ALL_SRC})
43+
set_property(TARGET sioclient PROPERTY CXX_STANDARD 11)
44+
set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON)
3945
target_link_libraries(sioclient ${Boost_LIBRARIES})
4046
INSTALL(FILES ${ALL_HEADERS}
4147
DESTINATION "${PROJECT_SOURCE_DIR}/build/include"
4248
)
4349
INSTALL(TARGETS sioclient
4450
DESTINATION "${PROJECT_SOURCE_DIR}/build/lib"
4551
)
46-
endif()
52+
endif()

src/internal/sio_client_impl.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#ifndef SIO_CLIENT_IMPL_H
22
#define SIO_CLIENT_IMPL_H
33

4-
#ifdef WIN32
4+
#ifdef _WIN32
5+
#include <cstdint>
56
#define _WEBSOCKETPP_CPP11_THREAD_
67
#define BOOST_ALL_NO_LIB
78
//#define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_

0 commit comments

Comments
 (0)