Fixed #6, and fixed Xilinx SDK not finding any include files - CMake …

…script sets all paths without using '..'.
AlphaAutomata · Nov 9, 2018 · 0a0165c · 0a0165c
1 parent 036c626
commit 0a0165c
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
@@ -4,23 +4,25 @@ cmake_minimum_required(VERSION 3.1)
 set(AlphaRTOS_K_VERSION_MAJOR 0)
 set(AlphaRTOS_K_VERSION_MINOR 0)
 
-set(ARTOS_ROOT_DIR ..)
-set(ARTOS_PUBLIC_DIR ${ARTOS_ROOT_DIR}/api/)
-set(ARTOS_KERNEL_DIR ${ARTOS_ROOT_DIR}/kernel/)
+get_filename_component(ARTOS_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
+get_filename_component(ARTOS_PARENT_DIR ${ARTOS_ROOT_DIR} DIRECTORY)
 
-set(KERNEL_INC_DIR ${ARTOS_KERNEL_DIR}/include/)
-set(KERNEL_SRC_DIR ${ARTOS_KERNEL_DIR}/src/)
+set(ARTOS_PUBLIC_DIR ${ARTOS_ROOT_DIR}/api)
+set(ARTOS_KERNEL_DIR ${ARTOS_ROOT_DIR}/kernel)
 
-set(HAL_ROOT_DIR ${ARTOS_ROOT_DIR}/../hal)
+set(KERNEL_INC_DIR ${ARTOS_KERNEL_DIR}/include)
+set(KERNEL_SRC_DIR ${ARTOS_KERNEL_DIR}/src)
+
+set(HAL_ROOT_DIR ${ARTOS_PARENT_DIR}/hal)
 set(HAL_RTOS_DIR ${HAL_ROOT_DIR}/rtos)
-set(HAL_RTOS_INC_DIR ${HAL_RTOS_DIR}/include/)
-set(HAL_RTOS_SRC_DIR ${HAL_RTOS_DIR}/src/)
+set(HAL_RTOS_INC_DIR ${HAL_RTOS_DIR}/include)
+set(HAL_RTOS_SRC_DIR ${HAL_RTOS_DIR}/src)
 
-set(CMSIS_ROOT_DIR ${ARTOS_ROOT_DIR}/../AlphaCMSIS)
+set(CMSIS_ROOT_DIR ${ARTOS_PARENT_DIR}/AlphaCMSIS)
 set(CMSIS_RTOS2_DIR ${CMSIS_ROOT_DIR}/CMSIS/RTOS2)
 
-set(CMSIS_RTOS2_INC_DIR ${CMSIS_RTOS2_DIR}/include/)
-set(CMSIS_RTOS2_SRC_DIR ${CMSIS_RTOS2_DIR}/Source/)
+set(CMSIS_RTOS2_INC_DIR ${CMSIS_RTOS2_DIR}/include)
+set(CMSIS_RTOS2_SRC_DIR ${CMSIS_RTOS2_DIR}/Source)
 
 project(AlphaRTOS)