fix according to comments

Author: songmeo

.github/workflows/main.yml

@@ -96,10 +96,10 @@ jobs:
           sudo apt-get update -y && sudo apt-get upgrade -y
           sudo apt-get install gcc-avr avr-libc
           avr-gcc --version
-      - run: avr-gcc libcanard/*.c -isystem lib -c -std=c99 -mmcu=${{ env.mcu }} ${{ env.flags }}
-      - run: avr-gcc libcanard/*.c -isystem lib -c -std=c11 -mmcu=${{ env.mcu }} ${{ env.flags }}
-      - run: avr-gcc libcanard/*.c -isystem lib -c -std=gnu99 -mmcu=${{ env.mcu }} ${{ env.flags }}
-      - run: avr-gcc libcanard/*.c -isystem lib -c -std=gnu11 -mmcu=${{ env.mcu }} ${{ env.flags }}
+      - run: avr-gcc libcanard/*.c -isystem lib/cavl2 -c -std=c99 -mmcu=${{ env.mcu }} ${{ env.flags }}
+      - run: avr-gcc libcanard/*.c -isystem lib/cavl2 -c -std=c11 -mmcu=${{ env.mcu }} ${{ env.flags }}
+      - run: avr-gcc libcanard/*.c -isystem lib/cavl2 -c -std=gnu99 -mmcu=${{ env.mcu }} ${{ env.flags }}
+      - run: avr-gcc libcanard/*.c -isystem lib/cavl2 -c -std=gnu11 -mmcu=${{ env.mcu }} ${{ env.flags }}
 
   arm:
     if: github.event_name == 'push'
@@ -111,8 +111,8 @@ jobs:
       - run: |
           sudo apt-get update -y && sudo apt-get upgrade -y
           sudo apt-get install -y gcc-arm-none-eabi
-      - run: arm-none-eabi-gcc libcanard/*.c -isystem lib -c -std=c99 ${{ env.flags }}
-      - run: arm-none-eabi-gcc libcanard/*.c -isystem lib -c -std=c11 ${{ env.flags }}
+      - run: arm-none-eabi-gcc libcanard/*.c -isystem lib/cavl2 -c -std=c99 ${{ env.flags }}
+      - run: arm-none-eabi-gcc libcanard/*.c -isystem lib/cavl2 -c -std=c11 ${{ env.flags }}
 
   style_check:
     if: github.event_name == 'push'
@@ -195,7 +195,6 @@ jobs:
         --define sonar.projectName=libcanard
         --define sonar.projectKey=libcanard
         --define sonar.sources=libcanard
-        --define sonar.exclusions=lib/cavl2/cavl2.h
         --define sonar.cfamily.gcov.reportsPath=.
         --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"
         --define sonar.host.url="${{ env.SONAR_SERVER_URL }}"

libcanard/canard.c

@@ -42,7 +42,7 @@
 // The internal includes are placed here after the config header is included and CANARD_ASSERT is defined.
 #define CAVL2_T struct CanardTreeNode
 #define CAVL2_ASSERT(x) CANARD_ASSERT(x)
-#include <../lib/cavl2/cavl2.h>
+#include <cavl2.h>
 
 // --------------------------------------------- COMMON DEFINITIONS ---------------------------------------------
 

tests/CMakeLists.txt

@@ -70,7 +70,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wnon-virtual-dtor
 
 include_directories(${library_dir})
 include_directories(SYSTEM catch)
-include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/../libcanard)
+include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/../lib/cavl2)
+include_directories(${CMAKE_SOURCE_DIR}/../libcanard)
 add_definitions(-DCATCH_CONFIG_FAST_COMPILE=1 -DCATCH_CONFIG_ENABLE_ALL_STRINGMAKERS=1)
 
 set(common_sources ${CMAKE_SOURCE_DIR}/main.cpp ${library_dir}/canard.c)