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

CMake git describe support #226

Merged
meierj merged 7 commits from mueller/cmake-git-describe-support into develop 2022-04-22 20:03:34 +02:00
Conversation 1 Commits 7 Files Changed 16 +7 -8
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0f80501467 - Show all commits

11
CMakeLists.txt
View File

@ -11,8 +11,7 @@ cmake_minimum_required(VERSION 3.13)
# set(CMAKE_VERBOSE TRUE) # 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_ETL_LIB "Add ETL library" ON)
option(EIVE_ADD_JSON_LIB "Add JSON library" ON) option(EIVE_ADD_JSON_LIB "Add JSON library" ON)
@ -40,8 +39,8 @@ if(TGT_BSP)
endif() endif()
# Perform steps like loading toolchain files where applicable. # Perform steps like loading toolchain files where applicable.
include(${CMAKE_SCRIPT_PATH}/PreProjectConfig.cmake) include(PreProjectConfig)
include(${CMAKE_SCRIPT_PATH}/helpers.cmake) include(EiveHelpers)
pre_project_config() pre_project_config()
# Version handling # Version handling
@ -399,7 +398,7 @@ endif()
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
include (${CMAKE_SCRIPT_PATH}/HardwareOsPostConfig.cmake) include (HardwareOsPostConfig)
post_source_hw_os_config() post_source_hw_os_config()
endif() endif()
@ -436,5 +435,5 @@ add_custom_command(
COMMENT ${POST_BUILD_COMMENT} COMMENT ${POST_BUILD_COMMENT}
) )
include (${CMAKE_SCRIPT_PATH}/BuildType.cmake) include (BuildType)
set_build_type() set_build_type()

2
cmake/helpers.cmake → cmake/EiveHelpers.cmake
View File

@ -6,7 +6,7 @@
# 4. Revision # 4. Revision
# 5. git SHA hash and commits since tag # 5. git SHA hash and commits since tag
function(determine_version_with_git) function(determine_version_with_git)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetGitRevisionDescription.cmake) include(GetGitRevisionDescription)
git_describe(VERSION ${ARGN}) git_describe(VERSION ${ARGN})
string(FIND ${VERSION} "." VALID_VERSION) string(FIND ${VERSION} "." VALID_VERSION)
if(VALID_VERSION EQUAL -1) if(VALID_VERSION EQUAL -1)

2
fsfw

@ -1 +1 @@
Subproject commit b951cb736a41c8b8db6532da3168529ad88cc017 Subproject commit 707a43aba98ea00a1fd5ab73642c357b7a36a7ad