rename helpers file
This commit is contained in:
parent
a416ca406b
commit
0f80501467
@ -11,8 +11,7 @@ cmake_minimum_required(VERSION 3.13)
|
||||
|
||||
# set(CMAKE_VERBOSE TRUE)
|
||||
|
||||
set(CMAKE_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
|
||||
option(EIVE_ADD_ETL_LIB "Add ETL library" ON)
|
||||
option(EIVE_ADD_JSON_LIB "Add JSON library" ON)
|
||||
@ -40,8 +39,8 @@ if(TGT_BSP)
|
||||
endif()
|
||||
|
||||
# Perform steps like loading toolchain files where applicable.
|
||||
include(${CMAKE_SCRIPT_PATH}/PreProjectConfig.cmake)
|
||||
include(${CMAKE_SCRIPT_PATH}/helpers.cmake)
|
||||
include(PreProjectConfig)
|
||||
include(EiveHelpers)
|
||||
pre_project_config()
|
||||
|
||||
# Version handling
|
||||
@ -399,7 +398,7 @@ endif()
|
||||
|
||||
|
||||
if(CMAKE_CROSSCOMPILING)
|
||||
include (${CMAKE_SCRIPT_PATH}/HardwareOsPostConfig.cmake)
|
||||
include (HardwareOsPostConfig)
|
||||
post_source_hw_os_config()
|
||||
endif()
|
||||
|
||||
@ -436,5 +435,5 @@ add_custom_command(
|
||||
COMMENT ${POST_BUILD_COMMENT}
|
||||
)
|
||||
|
||||
include (${CMAKE_SCRIPT_PATH}/BuildType.cmake)
|
||||
include (BuildType)
|
||||
set_build_type()
|
||||
|
@ -6,7 +6,7 @@
|
||||
# 4. Revision
|
||||
# 5. git SHA hash and commits since tag
|
||||
function(determine_version_with_git)
|
||||
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetGitRevisionDescription.cmake)
|
||||
include(GetGitRevisionDescription)
|
||||
git_describe(VERSION ${ARGN})
|
||||
string(FIND ${VERSION} "." VALID_VERSION)
|
||||
if(VALID_VERSION EQUAL -1)
|
2
fsfw
2
fsfw
@ -1 +1 @@
|
||||
Subproject commit b951cb736a41c8b8db6532da3168529ad88cc017
|
||||
Subproject commit 707a43aba98ea00a1fd5ab73642c357b7a36a7ad
|
Loading…
x
Reference in New Issue
Block a user