File tree Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Original file line number Diff line number Diff line change 1
- cmake_minimum_required (VERSION 2.6 )
1
+ cmake_minimum_required (VERSION 3.1.0 FATAL_ERROR )
2
2
PROJECT (sioclient )
3
3
4
4
set (BOOST_VER "1.55.0" CACHE STRING "boost version" )
5
5
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
+
7
11
8
12
if (${BOOST_PATH} STREQUAL "__boost__" )
9
13
set (BOOST_INCLUDE "__boost__" CACHE STRING "boost include path" )
@@ -36,11 +40,13 @@ if(Boost_FOUND)
36
40
file (GLOB ALL_HEADERS ${PROJECT_SOURCE_DIR} /src/*.h )
37
41
MESSAGE (STATUS ${ALL_HEADERS} )
38
42
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 )
39
45
target_link_libraries (sioclient ${Boost_LIBRARIES} )
40
46
INSTALL (FILES ${ALL_HEADERS}
41
47
DESTINATION "${PROJECT_SOURCE_DIR} /build/include"
42
48
)
43
49
INSTALL (TARGETS sioclient
44
50
DESTINATION "${PROJECT_SOURCE_DIR} /build/lib"
45
51
)
46
- endif ()
52
+ endif ()
Original file line number Diff line number Diff line change 1
1
#ifndef SIO_CLIENT_IMPL_H
2
2
#define SIO_CLIENT_IMPL_H
3
3
4
- #ifdef WIN32
4
+ #ifdef _WIN32
5
+ #include < cstdint>
5
6
#define _WEBSOCKETPP_CPP11_THREAD_
6
7
#define BOOST_ALL_NO_LIB
7
8
// #define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
You can’t perform that action at this time.
0 commit comments