mirror of
https://github.com/zeromq/cppzmq.git
synced 2024-12-12 10:33:52 +01:00
Update to Catch2 v3
This commit is contained in:
parent
6164cf7dbc
commit
77364388ac
@ -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}
|
||||||
)
|
)
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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)
|
||||||
|
@ -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)
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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)
|
||||||
|
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user