generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2024-12-12 10:33:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #632 from cybaol/update_to_catch2_v3

Browse Source 
Update to Catch2 v3
This commit is contained in:
Gudmundur Adalsteinsson 2024-08-11 21:22:21 +00:00 committed by GitHub
commit d537960670
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if (NOT Catch2_FOUND)
FetchContent_Declare( FetchContent_Declare(
Catch2 Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v2.13.9) GIT_TAG v3.5.3)
FetchContent_MakeAvailable(Catch2) FetchContent_MakeAvailable(Catch2)
@ -35,7 +35,7 @@ add_executable(
target_include_directories(unit_tests PUBLIC ${CATCH_MODULE_PATH}) target_include_directories(unit_tests PUBLIC ${CATCH_MODULE_PATH})
target_link_libraries( target_link_libraries(
unit_tests unit_tests
PRIVATE Catch2::Catch2 PRIVATE Catch2::Catch2WithMain
PRIVATE cppzmq PRIVATE cppzmq
PRIVATE ${CMAKE_THREAD_LIBS_INIT} PRIVATE ${CMAKE_THREAD_LIBS_INIT}
) )

2
tests/buffer.cpp
View File

@ -1,4 +1,4 @@
#include <catch2/catch.hpp> #include <catch2/catch_all.hpp>
#include <zmq.hpp> #include <zmq.hpp>
#ifdef ZMQ_CPP17 #ifdef ZMQ_CPP17

2
tests/codec_multipart.cpp
View File

@ -1,4 +1,4 @@
#include <catch2/catch.hpp> #include <catch2/catch_all.hpp>
#include <zmq_addon.hpp> #include <zmq_addon.hpp>
#ifdef ZMQ_CPP11 #ifdef ZMQ_CPP11

2
tests/context.cpp
View File

@ -1,4 +1,4 @@
#include <catch2/catch.hpp> #include <catch2/catch_all.hpp>
#include <zmq.hpp> #include <zmq.hpp>
#if (__cplusplus >= 201703L) #if (__cplusplus >= 201703L)

3
tests/message.cpp
View File

@ -1,5 +1,4 @@
#define CATCH_CONFIG_MAIN #include <catch2/catch_all.hpp>
#include <catch2/catch.hpp>
#include <zmq.hpp> #include <zmq.hpp>
#if defined(ZMQ_CPP11) #if defined(ZMQ_CPP11)

2
tests/multipart.cpp
View File

@ -1,4 +1,4 @@
#include <catch2/catch.hpp> #include <catch2/catch_all.hpp>
#include <zmq_addon.hpp> #include <zmq_addon.hpp>
#ifdef ZMQ_HAS_RVALUE_REFS #ifdef ZMQ_HAS_RVALUE_REFS

2
tests/recv_multipart.cpp
View File

@ -1,4 +1,4 @@
#include <catch2/catch.hpp> #include <catch2/catch_all.hpp>
#include <zmq_addon.hpp> #include <zmq_addon.hpp>
#ifdef ZMQ_CPP11 #ifdef ZMQ_CPP11

2
tests/send_multipart.cpp
View File

@ -1,4 +1,4 @@
#include <catch2/catch.hpp> #include <catch2/catch_all.hpp>
#include <zmq_addon.hpp> #include <zmq_addon.hpp>
#ifdef ZMQ_CPP11 #ifdef ZMQ_CPP11

2
tests/socket.cpp
View File

@ -1,4 +1,4 @@
#include <catch2/catch.hpp> #include <catch2/catch_all.hpp>
#include <zmq.hpp> #include <zmq.hpp>
#ifdef ZMQ_CPP11 #ifdef ZMQ_CPP11
#include <future> #include <future>

2
tests/socket_ref.cpp
View File

@ -1,4 +1,4 @@
#include <catch2/catch.hpp> #include <catch2/catch_all.hpp>
#include <zmq.hpp> #include <zmq.hpp>
#ifdef ZMQ_CPP11 #ifdef ZMQ_CPP11

2
tests/testutil.hpp
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <catch2/catch.hpp> #include <catch2/catch_all.hpp>
#include <zmq.hpp> #include <zmq.hpp>
#if defined(ZMQ_CPP11) #if defined(ZMQ_CPP11)

2
tests/utilities.cpp
View File

@ -1,4 +1,4 @@
#include <catch2/catch.hpp> #include <catch2/catch_all.hpp>
#include <zmq.hpp> #include <zmq.hpp>
#if defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL) #if defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL)