Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit13e173a

Browse files
authored
Merge pull request#246 from andreagilardoni/cmake-improvements
Catch2 update
2 parents4a02bfc +a919d81 commit13e173a

File tree

83 files changed

+129
-35869
lines changed

Some content is hidden

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

83 files changed

+129
-35869
lines changed

‎test/.gitignore‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,19 @@
1-
build
1+
build
2+
### CMake ###
3+
CMakeLists.txt.user
4+
CMakeCache.txt
5+
CMakeFiles
6+
CMakeScripts
7+
Testing
8+
Makefile
9+
cmake_install.cmake
10+
install_manifest.txt
11+
compile_commands.json
12+
CTestTestfile.cmake
13+
_deps
14+
15+
### CMake Patch ###
16+
CMakeUserPresets.json
17+
18+
# External projects
19+
*-prefix/

‎test/CMakeLists.txt‎

Lines changed: 12 additions & 2 deletions
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)

[8]ページ先頭

©2009-2025 Movatter.jp