eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

FSFW Gen and Build Scripts Update #71

Merged
meierj merged 7 commits from mueller/fsfwgen-update into develop 2021-08-02 13:11:36 +02:00
Conversation 0 Commits 7 Files Changed 61 +19 -16
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 503d5923c4 - Show all commits

3
CMakeLists.txt
View File

@ -19,7 +19,8 @@ if(TGT_BSP MATCHES "arm/q7s")
endif() endif()
option(ADD_ETL_LIB "Add ETL library" ON) option(ADD_ETL_LIB "Add ETL library" ON)
option(ADD_JSON_LIB "Add JSON librara" ON) option(ADD_JSON_LIB "Add JSON library" ON)
option(EIVE_SYSROOT_MAGIC "Perform sysroot magic which might not be necessary" OFF)
if(NOT FSFW_OSAL) if(NOT FSFW_OSAL)
set(FSFW_OSAL host CACHE STRING "OS for the FSFW.") set(FSFW_OSAL host CACHE STRING "OS for the FSFW.")

32
cmake/Q7SCrossCompileConfig.cmake
View File

@ -54,21 +54,23 @@ set(CMAKE_SYSTEM_PROCESSOR "armv7")
set(CMAKE_C_COMPILER ${CROSS_COMPILE_CC}) set(CMAKE_C_COMPILER ${CROSS_COMPILE_CC})
set(CMAKE_CXX_COMPILER ${CROSS_COMPILE_CXX}) set(CMAKE_CXX_COMPILER ${CROSS_COMPILE_CXX})
# List of library dirs where LD has to look. Pass them directly through gcc. if(EIVE_SYSROOT_MAGIC)
set(LIB_DIRS # List of library dirs where LD has to look. Pass them directly through gcc.
"${SYSROOT_PATH}/usr/include" set(LIB_DIRS
"${SYSROOT_PATH}/usr/include/linux" "${SYSROOT_PATH}/usr/include"
"${SYSROOT_PATH}/usr/lib" "${SYSROOT_PATH}/usr/include/linux"
"${SYSROOT_PATH}/lib" "${SYSROOT_PATH}/usr/lib"
"${SYSROOT_PATH}" "${SYSROOT_PATH}/lib"
"${SYSROOT_PATH}/usr/lib/arm-xiphos-linux-gnueabi" "${SYSROOT_PATH}"
) "${SYSROOT_PATH}/usr/lib/arm-xiphos-linux-gnueabi"
# You can additionally check the linker paths if you add the )
# flags ' -Xlinker --verbose' # You can additionally check the linker paths if you add the
set(COMMON_FLAGS "-I${SYSROOT_PATH}/usr/lib") # flags ' -Xlinker --verbose'
foreach(LIB ${LIB_DIRS}) set(COMMON_FLAGS "-I${SYSROOT_PATH}/usr/lib")
set(COMMON_FLAGS "${COMMON_FLAGS} -L${LIB} -Wl,-rpath-link,${LIB}") foreach(LIB ${LIB_DIRS})
endforeach() set(COMMON_FLAGS "${COMMON_FLAGS} -L${LIB} -Wl,-rpath-link,${LIB}")
endforeach()
endif()
set(CMAKE_PREFIX_PATH set(CMAKE_PREFIX_PATH
"${CMAKE_PREFIX_PATH}" "${CMAKE_PREFIX_PATH}"