update kunity and use new add_module function

This commit is contained in:
stubbfel
2018-02-16 00:12:09 +01:00
parent da13097d85
commit d312f88cba
2 changed files with 8 additions and 18 deletions

View File

@@ -13,10 +13,11 @@ file(GLOB module_src_files
"${PROJECT_SOURCE_DIR}/src/*.h"
"${PROJECT_SOURCE_DIR}/src/*.c")
set(modules_includes
"${KERNEL_DIR}/include" "${PROJECT_SOURCE_DIR}/src"
include_directories(
"${KERNEL_DIR}/include"
"${PROJECT_SOURCE_DIR}/src"
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/src")
add_module("${module_name}" "${module_src_files}" "${modules_includes}" "" "${KERNEL_DIR}")
add_module("${module_name}" "${module_src_files}" "${KERNEL_DIR}")
## test module section
@@ -32,22 +33,11 @@ file(GLOB module_test_files
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/Unity/src/*.h"
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/Unity/src/*.c")
file(GLOB test_modules_includes
${modules_includes}
include_directories(
"${PROJECT_SOURCE_DIR}/test/src"
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/src"
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/fff"
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/Unity/src")
set(test_modules_definitions -DUNITY_INCLUDE_CONFIG_H)
add_module("test_${module_name}" "${module_test_files}" "${test_modules_includes}" "${test_modules_definitions}" "${KERNEL_DIR}")
get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
foreach(dir ${dirs})
message(STATUS "dir='${dir}'")
endforeach()
get_property(defs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_DEFINITIONS)
foreach(def ${defs})
message(STATUS "def='${def}'")
endforeach()
add_definitions(-DUNITY_INCLUDE_CONFIG_H)
add_module("test_${module_name}" "${module_test_files}" "${KERNEL_DIR}")