Commit 13e173a

authored

Merge pull request #246 from andreagilardoni/cmake-improvements

Catch2 update

2 parents 4a02bfc + a919d81 commit 13e173aCopy full SHA for 13e173a

File tree

+129

-35869

lines changed

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

+129

-35869

lines changed

Lines changed: 19 additions & 1 deletion

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,20 @@ cmake_minimum_required(VERSION 2.8)`
`8`	`8`
`9`	`9`	`project(test-ArduinoCore-API)`
`10`	`10`
	`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`	`+`
`11`	`21`	`##########################################################################`
`12`	`22`
`13`	`23`	`include_directories(..)`
`14`	`24`	`include_directories(include)`
`15`		`-include_directories(external/catch/v2.13.9/include)`
`16`	`25`
`17`	`26`	`##########################################################################`
`18`	`27`
`@@ -118,7 +127,6 @@ set(TEST_DUT_SRCS`
`118`	`127`	`##########################################################################`
`119`	`128`
`120`	`129`	`set(TEST_TARGET_SRCS`
`121`		`- src/main.cpp`
`122`	`130`	`src/dtostrf.cpp`
`123`	`131`	`src/itoa.cpp`
`124`	`132`	`src/MillisFake.cpp`
`@@ -144,5 +152,7 @@ add_executable(`
`144`	`152`	`${TEST_TARGET_SRCS}`
`145`	`153`	`)`
`146`	`154`
	`155`	`+target_link_libraries( ${TEST_TARGET} Catch2WithMain )`
	`156`	`+`
`147`	`157`	`##########################################################################`
`148`	`158`

Comments

(0)