Skip to content

Commit 2aaef7b

Browse files
Updating Catch2
In order to update catch2 the following changes were made: - CMakeLists.txt: import catch2 with FetchContent_Declare, this will make it more flexible and easier to update - removed main for tests, since it is not mandatory and it doesn't add any value of having it - renaming includes in all the files
1 parent 10de470 commit 2aaef7b

File tree

82 files changed

+104
-35864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+104
-35864
lines changed

Diff for: test/CMakeLists.txt

+12-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,20 @@ cmake_minimum_required(VERSION 2.8)
88

99
project(test-ArduinoCore-API)
1010

11+
Include(FetchContent)
12+
13+
FetchContent_Declare(
14+
Catch2
15+
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
16+
GIT_TAG v3.4.0
17+
)
18+
19+
FetchContent_MakeAvailable(Catch2)
20+
1121
##########################################################################
1222

1323
include_directories(..)
1424
include_directories(include)
15-
include_directories(external/catch/v2.13.9/include)
1625

1726
##########################################################################
1827

@@ -118,7 +127,6 @@ set(TEST_DUT_SRCS
118127
##########################################################################
119128

120129
set(TEST_TARGET_SRCS
121-
src/main.cpp
122130
src/dtostrf.cpp
123131
src/itoa.cpp
124132
src/MillisFake.cpp
@@ -144,5 +152,7 @@ add_executable(
144152
${TEST_TARGET_SRCS}
145153
)
146154

155+
target_link_libraries( ${TEST_TARGET} Catch2WithMain )
156+
147157
##########################################################################
148158

0 commit comments

Comments
 (0)