From 74cbc558eccf5870adec653a8854115a04aeb693 Mon Sep 17 00:00:00 2001 From: Michael Schmid Date: Fri, 18 Nov 2016 16:06:51 +0100 Subject: [PATCH] minor changes for tricore --- CMakeLists.txt | 3 ++- TC_Toolchain.cmake | 2 +- base_c/src/core_set.c | 2 +- base_cpp/src/duration.cc | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06c2c01..68257df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,7 @@ endif() # The set option will be converted to uppercase letters by cmake!! --> ON/OFF # Note that the help string (second argument) cannot be printed by cmake. # -option(BUILD_TESTS "Specify whether tests should be built" OFF) +option(BUILD_TESTS "Specify whether tests should be built" ON) option(BUILD_EXAMPLES "Specify whether examples should be built" OFF) option(USE_EXCEPTIONS "Specify whether exceptions should be activated in C++" ON) option(INSTALL_DOCS "Specify whether Doxygen docs should be installed" ON) @@ -105,6 +105,7 @@ endif() message(" (set with command line option -DUSE_AUTOMATIC_INITIALIZATION=ON/OFF)") +#include the directory of the FreeRTOS library include_directories(${FREE_RTOS_LIB_PATH}/include) diff --git a/TC_Toolchain.cmake b/TC_Toolchain.cmake index 6b16744..109479c 100644 --- a/TC_Toolchain.cmake +++ b/TC_Toolchain.cmake @@ -17,7 +17,7 @@ SET(CMAKE_CXX_COMPILER C:/HighTec/toolchains/tricore/v4.6.6.0-infineon-1.1/bin/t SET(CMAKE_FIND_ROOT_PATH C:/HighTec/toolchains/tricore/v4.6.6.0-infineon-1.1) -SET(FREE_RTOS_LIB_PATH C:/data/projekte/freeRTOS_lib/) +SET(FREE_RTOS_LIB_PATH C:/Data/Projekte/FreeRTOS_TC27x/) # search for programs in the build host directories SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH) diff --git a/base_c/src/core_set.c b/base_c/src/core_set.c index 0b27a3f..deec0a5 100644 --- a/base_c/src/core_set.c +++ b/base_c/src/core_set.c @@ -149,7 +149,7 @@ void embb_core_set_init(embb_core_set_t* core_set, int initializer) { // scm3468 } -#endif EMBB_PLATFORM_THREADING_RTOSTASKS +#endif /* EMBB_PLATFORM_THREADING_RTOSTASKS */ void embb_core_set_add(embb_core_set_t* core_set, unsigned int core_number) { assert(core_set != NULL); diff --git a/base_cpp/src/duration.cc b/base_cpp/src/duration.cc index 2870ef8..fd146e0 100644 --- a/base_cpp/src/duration.cc +++ b/base_cpp/src/duration.cc @@ -141,7 +141,7 @@ unsigned long long internal::Microseconds::Max() { #if EMBB_DURATION_MAX_SECONDS < ULLONG_MAX / 1000000 return ULLONG_MAX; #else - return EMBB_DURATION_MAX_SECONDS * 1000000; + return EMBB_DURATION_MAX_SECONDS * 1000000; // sc: warning integer overflow #endif } -- libgit2 0.26.0