Skip to content

Commit 9d55f6e

Browse files
jmigualjmigual
authored
build(deps): update catch2 from 1.10.0 to v3.3.2 (#400)
* build(deps): update catch2 from 1.10.0 to v3.3.2 * Use new catch version * Fix test * Remove catch submodule
1 parent 9066882 commit 9d55f6e

5 files changed

Lines changed: 48 additions & 46 deletions

File tree

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@
77
[submodule "lib/asio"]
88
path = lib/asio
99
url = https://github.com/chriskohlhoff/asio.git
10-
[submodule "lib/catch"]
11-
path = lib/catch
12-
url = https://github.com/philsquared/Catch.git

‎CMakeLists.txt‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ option(BUILD_SHARED_LIBS "Build the shared library" OFF)
88
option(BUILD_UNIT_TESTS "Builds unit tests target" OFF)
99
option(USE_SUBMODULES "Use source in local submodules instead of system libraries" ON)
1010

11-
set(MAJOR 1)
12-
set(MINOR 6)
13-
set(PATCH 0)
14-
1511
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
1612
set(DEFAULT_BUILD_TYPE "Release")
1713
message(STATUS "Setting build type to '${DEFAULT_BUILD_TYPE}' as none was specified.")
@@ -21,13 +17,16 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
2117
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
2218
endif()
2319

24-
aux_source_directory(${CMAKE_CURRENT_LIST_DIR}/src ALL_SRC)
25-
aux_source_directory(${CMAKE_CURRENT_LIST_DIR}/src/internal ALL_SRC)
26-
27-
file(GLOB ALL_HEADERS ${CMAKE_CURRENT_LIST_DIR}/src/*.h)
20+
# Only do these if this is the main project, and not if it is included through add_subdirectory
21+
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
22+
# Testing only available if this is the main app
23+
# Note this needs to be done in the main CMakeLists
24+
# since it calls enable_testing, which must be in the
25+
# main CMakeLists.
26+
include(CTest)
27+
endif()
2828

2929
add_definitions(
30-
3130
# These will force ASIO to compile without Boost
3231
-DBOOST_DATE_TIME_NO_LIB
3332
-DBOOST_REGEX_NO_LIB
@@ -40,6 +39,12 @@ add_definitions(
4039
-D_WEBSOCKETPP_CPP11_CHRONO_
4140
)
4241

42+
set(ALL_SRC
43+
"src/sio_client.cpp"
44+
"src/sio_socket.cpp"
45+
"src/internal/sio_client_impl.cpp"
46+
"src/internal/sio_packet.cpp"
47+
)
4348
add_library(sioclient ${ALL_SRC})
4449

4550
if(USE_SUBMODULES)
@@ -55,25 +60,22 @@ else()
5560
target_link_libraries(sioclient PRIVATE websocketpp::websocketpp asio asio::asio rapidjson)
5661
endif()
5762

58-
target_include_directories(sioclient PUBLIC
59-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
63+
target_include_directories(sioclient
64+
PUBLIC
65+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
6066
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
6167
PRIVATE
6268
${MODULE_INCLUDE_DIRS}
6369
)
6470

65-
if(CMAKE_VERSION VERSION_GREATER "3.1")
66-
set_property(TARGET sioclient PROPERTY CXX_STANDARD 11)
67-
set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON)
68-
else()
69-
set_property(TARGET sioclient APPEND_STRING PROPERTY COMPILE_FLAGS "-std=c++11")
70-
endif()
71+
set_property(TARGET sioclient PROPERTY CXX_STANDARD 11)
72+
set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON)
7173

7274
if(BUILD_SHARED_LIBS)
7375
set_target_properties(sioclient
7476
PROPERTIES
75-
SOVERSION ${MAJOR}
76-
VERSION ${MAJOR}.${MINOR}.${PATCH}
77+
SOVERSION ${PROJECT_VERSION_MAJOR}
78+
VERSION ${PROJECT_VERSION}
7779
)
7880
endif()
7981

@@ -84,7 +86,7 @@ find_package(OpenSSL)
8486
if(OPENSSL_FOUND)
8587
add_library(sioclient_tls ${ALL_SRC})
8688
target_include_directories(sioclient_tls PUBLIC
87-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
89+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
8890
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
8991
PRIVATE
9092
${MODULE_INCLUDE_DIRS}
@@ -104,8 +106,8 @@ if(OPENSSL_FOUND)
104106
if(BUILD_SHARED_LIBS)
105107
set_target_properties(sioclient_tls
106108
PROPERTIES
107-
SOVERSION ${MAJOR}
108-
VERSION ${MAJOR}.${MINOR}.${PATCH}
109+
SOVERSION ${PROJECT_VERSION_MAJOR}
110+
VERSION ${PROJECT_VERSION}
109111
)
110112
endif()
111113

@@ -116,6 +118,7 @@ export(PACKAGE sioclient)
116118

117119
include(GNUInstallDirs)
118120

121+
file(GLOB ALL_HEADERS ${CMAKE_CURRENT_LIST_DIR}/src/*.h)
119122
install(FILES ${ALL_HEADERS}
120123
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
121124
)
@@ -163,8 +166,6 @@ install(
163166
${ConfigPackageLocation}
164167
)
165168

166-
if(BUILD_UNIT_TESTS)
167-
message(STATUS "Building with unit test support.")
168-
enable_testing()
169+
if((CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING) OR BUILD_UNIT_TESTS)
169170
add_subdirectory(test)
170171
endif()

‎lib/catch‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/CMakeLists.txt‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
include(FetchContent)
2+
3+
FetchContent_Declare(
4+
Catch2
5+
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
6+
GIT_TAG v3.3.2
7+
)
8+
FetchContent_MakeAvailable(Catch2)
9+
110
add_executable(sio_test sio_test.cpp)
211
set_property(TARGET sio_test PROPERTY CXX_STANDARD 11)
312
set_property(TARGET sio_test PROPERTY CXX_STANDARD_REQUIRED ON)
4-
target_link_libraries(sio_test sioclient)
5-
target_include_directories(sio_test PRIVATE
6-
"${CMAKE_CURRENT_SOURCE_DIR}/../lib/catch/include"
7-
"${CMAKE_CURRENT_SOURCE_DIR}/../src"
8-
)
13+
target_link_libraries(sio_test PRIVATE Catch2::Catch2WithMain sioclient)
914
add_test(sioclient_test sio_test)

‎test/sio_test.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
#include <iostream>
1111
#include <thread>
1212

13-
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
14-
#include "catch.hpp"
13+
#include <catch2/catch_test_macros.hpp>
1514

1615
#ifndef _WIN32
1716
#include "json.hpp" //nlohmann::json cannot build in MSVC
@@ -55,7 +54,7 @@ TEST_CASE( "test_packet_accept_1" )
5554
p.accept(payload,buffers);
5655
CHECK(buffers.size() == 0);
5756
CHECK(payload == "40/nsp");
58-
INFO("outputing payload:" << payload)
57+
INFO("outputing payload:" << payload);
5958
}
6059

6160
TEST_CASE( "test_packet_accept_2" )
@@ -66,7 +65,7 @@ TEST_CASE( "test_packet_accept_2" )
6665
p.accept(payload,buffers);
6766
CHECK(buffers.size() == 0);
6867
CHECK(payload == "2");
69-
INFO("outputing payload:" << payload)
68+
INFO("outputing payload:" << payload);
7069
}
7170

7271
TEST_CASE( "test_packet_accept_3" )
@@ -81,7 +80,7 @@ TEST_CASE( "test_packet_accept_3" )
8180
CHECK(p.get_type() == packet::type_ack);
8281
CHECK(buffers.size() == 0);
8382
CHECK(payload == "43/nsp,1001[\"event\",\"text\"]");
84-
INFO("outputing payload:" << payload)
83+
INFO("outputing payload:" << payload);
8584
}
8685

8786
#ifndef _WIN32
@@ -106,26 +105,26 @@ TEST_CASE( "test_packet_accept_4" )
106105
REQUIRE(json_start!=std::string::npos);
107106
std::string header = payload.substr(0,json_start);
108107
CHECK(header=="452-/nsp,1001");
109-
INFO("outputing payload:" << payload)
108+
INFO("outputing payload:" << payload);
110109
std::string json = payload.substr(json_start);
111110
nlohmann::json j = nlohmann::json::parse(json);
112111
CHECK(j["desc"].get<std::string>() == "Bin of 100 bytes");
113-
INFO("outputing payload desc::" << j["desc"].get<std::string>())
112+
INFO("outputing payload desc::" << j["desc"].get<std::string>());
114113
CHECK((bool)j["bin1"]["_placeholder"]);
115-
INFO("outputing payload bin1:" << j["bin1"].dump())
114+
INFO("outputing payload bin1:" << j["bin1"].dump());
116115
CHECK((bool)j["bin2"]["_placeholder"]);
117-
INFO("outputing payload bin2:" << j["bin2"].dump())
116+
INFO("outputing payload bin2:" << j["bin2"].dump());
118117
int bin1Num = j["bin1"]["num"].get<int>();
119118
char numchar[] = {0,0};
120119
numchar[0] = bin1Num+'0';
121120
CHECK(buffers[bin1Num]->length()==100);
122-
INFO("outputing payload bin1 num:" << numchar)
121+
INFO("outputing payload bin1 num:" << numchar);
123122
CHECK(buffers[bin1Num]->at(50)==0);
124123
CHECK(buffers[bin1Num]->at(0) == 0);
125124
int bin2Num = j["bin2"]["num"].get<int>();
126125
numchar[0] = bin2Num+'0';
127126
CHECK(buffers[bin2Num]->length()==50);
128-
INFO("outputing payload bin2 num:" << numchar)
127+
INFO("outputing payload bin2 num:" << numchar);
129128
CHECK(buffers[bin2Num]->at(25)==1);
130129
CHECK(buffers[bin2Num]->at(0) == 1);
131130
}
@@ -210,7 +209,8 @@ TEST_CASE( "test_packet_parse_4" )
210209
bool hasbin = p.parse("452-/nsp,101[\"bin_event\",[{\"_placeholder\":true,\"num\":1},{\"_placeholder\":true,\"num\":0},\"text\"]]");
211210
CHECK(hasbin);
212211
char buf[100];
213-
memset(buf,0,100);
212+
buf[0] = packet::frame_message;
213+
memset(buf + 1,0,99);
214214

215215
std::string bufstr(buf,100);
216216
std::string bufstr2(buf,50);

0 commit comments

Comments
 (0)