Compile trace folder in Debug build type

857d1610 · Henrique Silva · 955f6bf2 · 857d1610 · 857d1610
Commit 857d1610 authored Dec 18, 2015 by Henrique Silva
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 6 deletions

CMakeLists.txt CMakeLists.txt +8 -6

CMakeLists.txt trace/CMakeLists.txt +14 -0

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,10 +9,13 @@ project(afcipm C CXX ASM)
 #

 if(NOT CMAKE_TOOLCHAIN_FILE)
-  message(FATAL_ERROR "No toolchain configuration file specified.")
+  message(WARNING "${ColourBold}${Red}No toolchain configuration file specified. Using default option!${ColourReset}")
+
+  include(build_cfg/toolchain/toolchain-arm-none-eabi.cmake)
+
 endif()

-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build_cfg")

 # Include user configuration
 include(${CMAKE_MODULE_PATH}/config.cmake)
@@ -69,10 +72,9 @@ set(PROJ_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/afcipm.c)
 add_subdirectory(FreeRTOS)
 add_subdirectory(port)
 add_subdirectory(modules)
-
-#if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-#  add_subdirectory(trace)
-#endif()
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  add_subdirectory(trace)
+endif()

 #Link libraries
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/FreeRTOS)

--- a/trace/CMakeLists.txt
+++ b/trace/CMakeLists.txt
+set(TRACE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+
+set(PROJ_HDRS ${PROJ_HDRS} ${TRACE_PATH})
+
+set(PROJ_SRCS ${PROJ_SRCS} ${TRACE_PATH}/trcBase.c
+  ${TRACE_PATH}/trcHardwarePort.c
+  ${TRACE_PATH}/trcKernel.c
+  ${TRACE_PATH}/trcKernelPortFreeRTOS.c
+  ${TRACE_PATH}/trcRecorder.c
+  ${TRACE_PATH}/trcUser.c
+  )
+
+set(PROJ_SRCS ${PROJ_SRCS} PARENT_SCOPE)
+set(PROJ_HDRS ${PROJ_HDRS} PARENT_SCOPE)