fix minor compile problems
This commit is contained in:
7
.vscode/c_cpp_properties.json
vendored
7
.vscode/c_cpp_properties.json
vendored
@@ -5,10 +5,11 @@
|
|||||||
"includePath": [
|
"includePath": [
|
||||||
"${workspaceFolder}/utility/unity/core",
|
"${workspaceFolder}/utility/unity/core",
|
||||||
"${workspaceFolder}/utility/unity/fixture",
|
"${workspaceFolder}/utility/unity/fixture",
|
||||||
|
"${workspaceFolder}/utility/fff",
|
||||||
|
"${workspaceFolder}/test/cmd_parser/helpers/inc",
|
||||||
|
"${workspaceFolder}/cmd_parser",
|
||||||
"${workspaceFolder}/test/oled/helpers/inc",
|
"${workspaceFolder}/test/oled/helpers/inc",
|
||||||
"${workspaceFolder}/test/oled/",
|
"${workspaceFolder}/oled"
|
||||||
"${workspaceFolder}/cmd_parser/",
|
|
||||||
"${workspaceFolder}/**"
|
|
||||||
],
|
],
|
||||||
"defines": [
|
"defines": [
|
||||||
"_DEBUG",
|
"_DEBUG",
|
||||||
|
|||||||
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
@@ -10,5 +10,8 @@
|
|||||||
"unityExplorer.prettyTestCaseRegex": "test_(\\w+)",
|
"unityExplorer.prettyTestCaseRegex": "test_(\\w+)",
|
||||||
"unityExplorer.prettyTestFileRegex": "(\\w+)_test\\.c",
|
"unityExplorer.prettyTestFileRegex": "(\\w+)_test\\.c",
|
||||||
"unityExplorer.debugConfiguration": "Unity Test Explorer Debug",
|
"unityExplorer.debugConfiguration": "Unity Test Explorer Debug",
|
||||||
|
"files.associations": {
|
||||||
|
"main.h": "c"
|
||||||
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -15,5 +15,5 @@ add_definitions(${GLOBAL_DEFINITION})
|
|||||||
add_subdirectory(utility/unity unity)
|
add_subdirectory(utility/unity unity)
|
||||||
link_libraries(unity)
|
link_libraries(unity)
|
||||||
|
|
||||||
# add_subdirectory(test/oled oled)
|
add_subdirectory(test/oled oled)
|
||||||
add_subdirectory(test/cmd_parser cmd_parser)
|
add_subdirectory(test/cmd_parser cmd_parser)
|
||||||
@@ -9,7 +9,7 @@ set(INCLUDE_DIRS
|
|||||||
)
|
)
|
||||||
|
|
||||||
set(SRCS
|
set(SRCS
|
||||||
../../cmd_parser/cmd_parser2.c
|
../../cmd_parser/cmd_parser.c
|
||||||
|
|
||||||
# helpers/src/led_cmd.c
|
# helpers/src/led_cmd.c
|
||||||
cmd_parser_test.c
|
cmd_parser_test.c
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
cmake_minimum_required(VERSION 3.10)
|
cmake_minimum_required(VERSION 3.10)
|
||||||
|
|
||||||
set(TEST_NAME oled)
|
set(TEST_NAME oled_test)
|
||||||
|
|
||||||
set(INCLUDE_DIRS
|
set(INCLUDE_DIRS
|
||||||
../../oled
|
../../oled
|
||||||
|
|||||||
Reference in New Issue
Block a user