Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

typo when setting NRN_COVERAGE_FLAGS #2530

Merged
merged 3 commits into from
Sep 24, 2023
Merged

typo when setting NRN_COVERAGE_FLAGS #2530

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db057f1
typo when setting NRN_COVERAGE_FLAGS
nrnhines Sep 24, 2023
8c93cb8
Merge branch 'master' into hines/fix-NRN_COVERAGE_FLAGS
nrnhines Sep 24, 2023
bae398e
NRN_COVERAGE_LIB does not need to be set to gcov anymore.
nrnhines Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions cmake/Coverage.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ if(NRN_ENABLE_COVERAGE)
message(WARNING "Using CMAKE_BUILD_TYPE=Debug is recommended with NRN_ENABLE_COVERAGE")
endif()
set(NRN_COVERAGE_FLAGS_UNQUOTED --coverage -fno-inline)
string(JOIN " " NRN_COVERAGE_FLAGS ${NRN_COVERAGE_FLAGS})
set(NRN_COVERAGE_LIB gcov)
string(JOIN " " NRN_COVERAGE_FLAGS ${NRN_COVERAGE_FLAGS_UNQUOTED})
set(NRN_COVERAGE_LINK_FLAGS --coverage)

if(NRN_COVERAGE_FILES)
Expand All @@ -60,11 +59,11 @@ if(NRN_ENABLE_COVERAGE)
"${NRN_COVERAGE_FLAGS}"
CACHE INTERNAL "Remind that this is always in effect from now on" FORCE)
list(APPEND NRN_COMPILE_FLAGS ${NRN_COVERAGE_FLAGS_UNQUOTED})
list(APPEND NRN_LINK_FLAGS ${NRN_COVERAGE_LINK_FLAGS})
list(APPEND CORENRN_EXTRA_CXX_FLAGS ${NRN_COVERAGE_FLAGS_UNQUOTED})
list(APPEND CORENRN_EXTRA_MECH_CXX_FLAGS ${NRN_COVERAGE_FLAGS_UNQUOTED})
list(APPEND CORENRN_EXTRA_LINK_FLAGS ${NRN_COVERAGE_LINK_FLAGS})
endif()
list(APPEND NRN_LINK_FLAGS ${NRN_COVERAGE_LINK_FLAGS})
list(APPEND CORENRN_EXTRA_LINK_FLAGS ${NRN_COVERAGE_LINK_FLAGS})
list(APPEND NRN_COMPILE_DEFS NRN_COVERAGE_ENABLED)
else()
unset(NRN_COVERAGE_FLAGS)
Expand Down
Loading