add new submodules and nix build env

This commit is contained in:
stubbfel
2018-03-28 16:18:44 +02:00
parent e5b5e71af5
commit 7d3f2a8beb
4 changed files with 35 additions and 24 deletions

View File

@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.6)
include("test/lib/KUnity/dev-utility/BuildKernelModule.cmake")
include("dev-utility/CMake-Module/BuildKernelModule/BuildKernelModule.cmake")
SET(module_name kunity_test_runner_module)
project (${module_name})
@@ -10,35 +10,29 @@ endif()
set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -pedantic -Weverything")
file(GLOB module_src_files
"${PROJECT_SOURCE_DIR}/src/*.h"
"${PROJECT_SOURCE_DIR}/src/*.c")
file(GLOB module_src_files "${PROJECT_SOURCE_DIR}/src/*.c")
include_directories(
"${KERNEL_DIR}/include"
"${PROJECT_SOURCE_DIR}/src"
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/src")
"${PROJECT_SOURCE_DIR}/lib/KUnity/src")
add_module("${module_name}" "${module_src_files}" "${KERNEL_DIR}")
if(BUILD_TEST_MOUDLE)
## test module section
Set(TEST_MODULE_SOURCE_DIR "${PROJECT_BINARY_DIR}/test_${module_name}")
Set(TEST_MODULE_SOURCE_DIR "${PROJECT_BINARY_DIR}/test_${module_name}")
file(GLOB module_test_files
${module_src_files}
"${PROJECT_SOURCE_DIR}/test/src/*.c"
"${PROJECT_SOURCE_DIR}/lib/KUnity/src/*.c"
"${PROJECT_SOURCE_DIR}/lib/KUnity/lib/Unity/src/*.c")
file(GLOB module_test_files
${module_src_files}
"${PROJECT_SOURCE_DIR}/test/src/*.c"
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/Kbuild"
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/src/*.h"
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/src/*.c"
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/fff/fff.h"
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/Unity/src/*.h"
"${PROJECT_SOURCE_DIR}/test/lib/KUnity/lib/Unity/src/*.c")
include_directories(
"${KERNEL_DIR}/include"
"${PROJECT_SOURCE_DIR}/test/src"
"${PROJECT_SOURCE_DIR}/lib/KUnity/lib/Unity/src")
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")
add_definitions(-DUNITY_INCLUDE_CONFIG_H)
add_module("test_${module_name}" "${module_test_files}" "${KERNEL_DIR}")
add_definitions(-DUNITY_INCLUDE_CONFIG_H)
add_module("test_${module_name}" "${module_test_files}" "${KERNEL_DIR}")
endif()

Submodule dev-utility/CMake-Module/BuildKernelModule added at fc86d1e5f7

View File

@@ -0,0 +1,15 @@
with import <nixpkgs> {};
stdenv.mkDerivation rec {
name = "kttd-buid-env";
env = buildEnv { name = name; paths = buildInputs; };
buildInputs = [
gcc
cmake
elfutils
];
hardeningDisable = [ "pic" ];
}

1
lib/KUnity Submodule

Submodule lib/KUnity added at 98ffa6508d