moved all third-party lib to separate folder

This commit is contained in:
Robin Müller 2021-02-27 19:32:58 +01:00
parent b5650033d8
commit 6518a7f244
138 changed files with 22 additions and 2 deletions

View File

@ -15,6 +15,7 @@ cmake_minimum_required(VERSION 3.13)
set(CMAKE_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
option(ADD_ETL_LIB "Add ETL library" ON)
if(NOT OS_FSFW)
set(OS_FSFW host CACHE STRING "OS for the FSFW.")
endif()
@ -37,15 +38,20 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
# Set names and variables
set(TARGET_NAME ${CMAKE_PROJECT_NAME})
set(LIB_FSFW_NAME fsfw)
set(LIB_ETL_NAME etl)
set(LIB_CSP_NAME libcsp)
set(THIRD_PARTY_FOLDER thirdparty)
# Set path names
set(FSFW_PATH fsfw)
set(MISSION_PATH mission)
set(CSPLIB_PATH libcsp)
set(TEST_PATH test/testtasks)
set(LINUX_PATH linux)
set(CSP_LIB_PATH ${THIRD_PARTY_FOLDER}/libcsp)
set(ETL_LIB_PATH ${THIRD_PARTY_FOLDER}/etl)
set(LWGPS_LIB_PATH ${THIRD_PARTY_FOLDER}/lwgps)
set(FSFW_WARNING_SHADOW_LOCAL_GCC OFF)
set(ADD_LINUX_FILES FALSE)
@ -87,7 +93,11 @@ if(ROOT_CONFIG_FOLDER)
endif()
if(ADD_CSP_LIB)
add_subdirectory(${CSPLIB_PATH})
add_subdirectory(${CSP_LIB_PATH})
endif()
if(ADD_ETL_LIB)
add_subdirectory(${ETL_LIB_PATH})
endif()
if(ADD_LINUX_FILES)
@ -111,6 +121,12 @@ target_link_libraries(${TARGET_NAME} PRIVATE
${LIB_OS_NAME}
)
if(ADD_ETL_LIB)
target_link_libraries(${TARGET_NAME} PRIVATE
${LIB_ETL_NAME}
)
endif()
if(ADD_CSP_LIB)
target_link_libraries(${TARGET_NAME} PRIVATE
${LIB_CSP_NAME}

View File

@ -41,8 +41,12 @@ ReturnValue_t TestTask::performOperation(uint8_t operationCode) {
return result;
}
#include <etl/vector.h>
ReturnValue_t TestTask::performOneShotAction() {
/* Everything here will only be performed once. */
etl::vector<uint8_t, 30> testVec;
return HasReturnvaluesIF::RETURN_OK;
}

Some files were not shown because too many files have changed in this diff Show More