Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
abdes committed Sep 20, 2022
2 parents 0bec238 + d7309a0 commit 93f3e75
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ set(META_VERSION_PATCH "0")
set(META_VERSION_REVISION "${GIT_REV}")
set(META_VERSION "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
set(META_NAME_VERSION "${META_PROJECT_NAME} v${META_VERSION} (${META_VERSION_REVISION})")
set(META_CMAKE_INIT_SHA "${GIT_REV}")
# cmake-format: on

string(MAKE_C_IDENTIFIER ${META_PROJECT_NAME} META_PROJECT_ID)
Expand Down Expand Up @@ -159,7 +158,7 @@ if(ASAP_BUILD_TESTS)
include(GoogleSanitizers)
include(CodeCoverage)
# Enable this target when the project has test cases
# asap_add_code_coverage_all_targets()
asap_add_code_coverage_all_targets()
include(Valgrind)

cpmaddpackage(
Expand Down
10 changes: 6 additions & 4 deletions tools/version-info/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,12 @@ target_include_directories(
# Run executable test
# ------------------------------------------------------------------------------

add_test(
NAME version-info
COMMAND ${MODULE_TARGET_NAME}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
if(ASAP_BUILD_TESTS)
add_test(
NAME version-info
COMMAND ${MODULE_TARGET_NAME}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
endif()

# ==============================================================================
# Deployment instructions
Expand Down

0 comments on commit 93f3e75

Please sign in to comment.