Skip to content

Commit 9efd097

Browse files
committed
Refactor, add tests and code
1 parent 7c59086 commit 9efd097

File tree

5 files changed

+578
-4
lines changed

5 files changed

+578
-4
lines changed

CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ set(BOOST_WS_IO_DEPENDENCIES
6060
Boost::system
6161
Boost::url
6262
Boost::ws_proto
63+
Boost::http_io
6364
)
6465

6566
foreach (BOOST_WS_IO_DEPENDENCY ${BOOST_WS_IO_DEPENDENCIES})
@@ -131,13 +132,15 @@ endif ()
131132
#-------------------------------------------------
132133
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
133134

134-
file(GLOB_RECURSE BOOST_WS_IO_HEADERS CONFIGURE_DEPENDS include/boost/*.hpp include/boost/*.natvis)
135+
file(GLOB_RECURSE BOOST_WS_IO_HEADERS CONFIGURE_DEPENDS include/boost/ws_io/*.hpp include/boost/ws_io/*.natvis)
135136
file(GLOB_RECURSE BOOST_WS_IO_SOURCES CONFIGURE_DEPENDS src/*.cpp src/*.hpp)
137+
file(GLOB_RECURSE BOOST_WS_PROTO_SOURCES CONFIGURE_DEPENDS src/*.cpp src/*.hpp)
136138

137-
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost PREFIX "" FILES ${BOOST_WS_IO_HEADERS})
138-
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "ws_io" FILES ${BOOST_WS_IO_SOURCES})
139+
source_group("" FILES "include/boost/ws_io.hpp" "build/Jamfile")
140+
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost/ws_io PREFIX "include" FILES ${BOOST_WS_IO_HEADERS})
141+
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "src" FILES ${BOOST_WS_IO_SOURCES})
139142

140-
add_library(boost_ws_io ${BOOST_WS_IO_HEADERS} ${BOOST_WS_IO_SOURCES})
143+
add_library(boost_ws_io include/boost/ws_io.hpp build/Jamfile ${BOOST_WS_IO_HEADERS} ${BOOST_WS_IO_SOURCES})
141144
add_library(Boost::ws_io ALIAS boost_ws_io)
142145
target_compile_features(boost_ws_io PUBLIC cxx_constexpr)
143146
target_include_directories(boost_ws_io PUBLIC "${PROJECT_SOURCE_DIR}/include")

test/unit/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ find_package(OpenSSL REQUIRED)
2222
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "" FILES ${PFILES})
2323
source_group("_extra" FILES ${EXTRAFILES})
2424
add_executable(boost_ws_io_tests ${PFILES} ${EXTRAFILES})
25+
if (MSVC)
26+
target_compile_options(boost_ws_io_tests PRIVATE "/bigobj")
27+
endif()
2528
target_include_directories(boost_ws_io_tests PRIVATE . ../../../url/extra)
29+
target_include_directories(boost_ws_io_tests PRIVATE "${PROJECT_SOURCE_DIR}")
2630
target_link_libraries(boost_ws_io_tests PRIVATE
2731
OpenSSL::SSL
2832
boost_beast

0 commit comments

Comments
 (0)