Skip to content

Commit e6b1539

Browse files
Remove embedded Catch2 and use external repository with tag v3.15.1
1 parent ec1cbd5 commit e6b1539

33 files changed

Lines changed: 36 additions & 18567 deletions

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,13 @@ if (USE_WS OR USE_TEST)
335335
add_subdirectory(ws)
336336
endif()
337337
if (USE_TEST)
338+
FetchContent_Declare(Catch2
339+
GIT_REPOSITORY "https://github.com/catchorg/Catch2"
340+
GIT_TAG "v3.15.1"
341+
GIT_SHALLOW 1)
342+
343+
FetchContent_MakeAvailable(Catch2)
344+
338345
enable_testing()
339346
add_subdirectory(test)
340347
endif()

test/CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@ target_sources(ixwebsocket_test PRIVATE
6363
IXTest.cpp
6464
)
6565
target_compile_definitions(ixwebsocket_test PRIVATE ${TEST_PROGRAMS_DEFINITIONS})
66-
target_include_directories(ixwebsocket_test PRIVATE
67-
${PROJECT_SOURCE_DIR}/Catch2/single_include
68-
)
66+
67+
target_link_libraries(ixwebsocket_test Catch2)
6968
target_link_libraries(ixwebsocket_test ixwebsocket)
7069
target_link_libraries(ixwebsocket_test spdlog)
7170
target_link_libraries(ixwebsocket_test msgpack11)
@@ -75,10 +74,6 @@ foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
7574
${TEST_TARGET_NAME}.cpp
7675
)
7776

78-
target_include_directories(${TEST_TARGET_NAME} PRIVATE
79-
${PROJECT_SOURCE_DIR}/Catch2/single_include
80-
)
81-
8277
target_compile_definitions(${TEST_TARGET_NAME} PRIVATE SPDLOG_COMPILED_LIB=1)
8378

8479
if (APPLE AND USE_TLS)
@@ -89,6 +84,7 @@ foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
8984
target_link_libraries(${TEST_TARGET_NAME} ixwebsocket_test)
9085
target_link_libraries(${TEST_TARGET_NAME} ixwebsocket)
9186

87+
target_link_libraries(${TEST_TARGET_NAME} Catch2)
9288
target_link_libraries(${TEST_TARGET_NAME} spdlog)
9389
target_link_libraries(${TEST_TARGET_NAME} msgpack11)
9490

0 commit comments

Comments
 (0)