Skip to content

Commit 2eb2a30

Browse files
committed
add more compiling compatibility
1 parent 65521db commit 2eb2a30

File tree

2 files changed

+27
-24
lines changed

2 files changed

+27
-24
lines changed

CMakeLists.txt

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ 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_DEBUG "-O0 -g")
7-
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG")
8-
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
9-
10-
116

127
if(${BOOST_PATH} STREQUAL "__boost__" )
138
set(BOOST_INCLUDE "__boost__" CACHE STRING "boost include path" )
@@ -31,22 +26,30 @@ set(Boost_DEBUG 1)
3126
set(Boost_USE_STATIC_LIBS ON)
3227
set(Boost_USE_MULTITHREADED ON)
3328
set(Boost_USE_STATIC_RUNTIME OFF)
34-
find_package(Boost ${BOOST_VER} COMPONENTS system date_time random)
29+
find_package(Boost ${BOOST_VER} REQUIRED COMPONENTS system date_time random)
30+
31+
MESSAGE(STATUS ${Boost_SYSTEM_LIBRARY} )
32+
MESSAGE(STATUS ${CMAKE_CURRENT_LIST_DIR})
33+
aux_source_directory(${CMAKE_CURRENT_LIST_DIR}/src ALL_SRC)
34+
aux_source_directory(${CMAKE_CURRENT_LIST_DIR}/src/internal ALL_SRC)
35+
file(GLOB ALL_HEADERS ${CMAKE_CURRENT_LIST_DIR}/src/*.h )
36+
MESSAGE(STATUS ${ALL_HEADERS} )
37+
38+
add_library(sioclient STATIC ${ALL_SRC})
39+
target_include_directories(sioclient PRIVATE ${Boost_INCLUDE_DIRS}
40+
${CMAKE_CURRENT_LIST_DIR}/src
41+
${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp
42+
${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include
43+
)
44+
45+
set_property(TARGET sioclient PROPERTY CXX_STANDARD 11)
46+
set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON)
47+
target_link_libraries(sioclient PRIVATE ${Boost_LIBRARIES})
48+
install(FILES ${ALL_HEADERS}
49+
DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/include"
50+
)
51+
install(FILES ${Boost_LIBRARIES} DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/lib")
3552

36-
if(Boost_FOUND)
37-
include_directories(${Boost_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/lib/websocketpp ${PROJECT_SOURCE_DIR}/lib/rapidjson/include)
38-
aux_source_directory(${PROJECT_SOURCE_DIR}/src ALL_SRC)
39-
aux_source_directory(${PROJECT_SOURCE_DIR}/src/internal ALL_SRC)
40-
file(GLOB ALL_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h )
41-
MESSAGE(STATUS ${ALL_HEADERS} )
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)
45-
target_link_libraries(sioclient ${Boost_LIBRARIES})
46-
INSTALL(FILES ${ALL_HEADERS}
47-
DESTINATION "${PROJECT_SOURCE_DIR}/build/include"
48-
)
49-
INSTALL(TARGETS sioclient
50-
DESTINATION "${PROJECT_SOURCE_DIR}/build/lib"
51-
)
52-
endif()
53+
install(TARGETS sioclient
54+
DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/lib"
55+
)

src/internal/sio_client_impl.h

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

4-
#ifdef _WIN32
54
#include <cstdint>
5+
#ifdef _WIN32
66
#define _WEBSOCKETPP_CPP11_THREAD_
77
#define BOOST_ALL_NO_LIB
88
//#define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_

0 commit comments

Comments
 (0)