Skip to content

Commit ecfd769

Browse files
committed
add cavl2.h as system header
1 parent a3e3160 commit ecfd769

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ jobs:
9696
sudo apt-get update -y && sudo apt-get upgrade -y
9797
sudo apt-get install gcc-avr avr-libc
9898
avr-gcc --version
99-
- run: avr-gcc libcanard/*.c -c -std=c99 -mmcu=${{ env.mcu }} ${{ env.flags }}
100-
- run: avr-gcc libcanard/*.c -c -std=c11 -mmcu=${{ env.mcu }} ${{ env.flags }}
101-
- run: avr-gcc libcanard/*.c -c -std=gnu99 -mmcu=${{ env.mcu }} ${{ env.flags }}
102-
- run: avr-gcc libcanard/*.c -c -std=gnu11 -mmcu=${{ env.mcu }} ${{ env.flags }}
99+
- run: avr-gcc libcanard/*.c -Ilibcanard -c -std=c99 -mmcu=${{ env.mcu }} ${{ env.flags }}
100+
- run: avr-gcc libcanard/*.c -Ilibcanard -c -std=c11 -mmcu=${{ env.mcu }} ${{ env.flags }}
101+
- run: avr-gcc libcanard/*.c -Ilibcanard -c -std=gnu99 -mmcu=${{ env.mcu }} ${{ env.flags }}
102+
- run: avr-gcc libcanard/*.c -Ilibcanard -c -std=gnu11 -mmcu=${{ env.mcu }} ${{ env.flags }}
103103

104104
arm:
105105
if: github.event_name == 'push'
@@ -111,8 +111,8 @@ jobs:
111111
- run: |
112112
sudo apt-get update -y && sudo apt-get upgrade -y
113113
sudo apt-get install -y gcc-arm-none-eabi
114-
- run: arm-none-eabi-gcc libcanard/*.c -c -std=c99 ${{ env.flags }}
115-
- run: arm-none-eabi-gcc libcanard/*.c -c -std=c11 ${{ env.flags }}
114+
- run: arm-none-eabi-gcc libcanard/*.c -Ilibcanard -c -std=c99 ${{ env.flags }}
115+
- run: arm-none-eabi-gcc libcanard/*.c -Ilibcanard -c -std=c11 ${{ env.flags }}
116116

117117
style_check:
118118
if: github.event_name == 'push'

libcanard/canard.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
// --------------------------------------------- INTERNAL INCLUDES ----------------------------------------------
4242
// The internal includes are placed here after the config header is included and CANARD_ASSERT is defined.
4343
#define CAVL2_T struct CanardTreeNode
44-
#include "cavl2.h"
44+
#include <cavl2.h>
4545

4646
// --------------------------------------------- COMMON DEFINITIONS ---------------------------------------------
4747

tests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wnon-virtual-dtor
7070

7171
include_directories(${library_dir})
7272
include_directories(SYSTEM catch)
73+
include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/../libcanard)
7374
add_definitions(-DCATCH_CONFIG_FAST_COMPILE=1 -DCATCH_CONFIG_ENABLE_ALL_STRINGMAKERS=1)
7475

7576
set(common_sources ${CMAKE_SOURCE_DIR}/main.cpp ${library_dir}/canard.c)

0 commit comments

Comments
 (0)