Commit dc7e3f4f authored by Dominik Charousset's avatar Dominik Charousset

Merge branch 'develop' into topic/actor-system

parents 217c2f50 5097f69c
......@@ -115,6 +115,10 @@ endif()
if(CAF_CXX_WARNINGS_AS_ERRORS)
set(EXTRA_FLAGS "${EXTRA_FLAGS} -Werror")
endif()
# set compiler flags for GCOV if requested
if(CAF_ENABLE_GCOV)
set(EXTRA_FLAGS "${EXTRA_FLAGS} -fprofile-arcs -ftest-coverage")
endif()
# enable a ton of warnings if --more-clang-warnings is used
if(CAF_MORE_WARNINGS)
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
......
......@@ -7,7 +7,7 @@ network transparent messaging, and more.
[![Gitter][gitter-badge]]
(https://gitter.im/actor-framework/chat)
[![Jenkins][jenkins-badge]]
(http://mobi39.cpt.haw-hamburg.de/view/CAF%20Dashboard)
(https://jenkins.inet.haw-hamburg.de/view/CAF%20Dashboard)
[![Coverity][coverity-badge]]
(https://scan.coverity.com/projects/5555)
[![In Progress][in-progress-badge]]
......@@ -193,7 +193,7 @@ https://software.opensuse.org/download.html?project=devel%3Alibraries%3Acaf&pack
https://software.opensuse.org/download.html?project=devel%3Alibraries%3Acaf%3Anightly&package=caf-devel
[jenkins-badge]:
http://mobi39.cpt.haw-hamburg.de/buildStatus/icon?job=CAF/master%20branch
https://jenkins.inet.haw-hamburg.de/buildStatus/icon?job=CAF/master%20branch
[coverity-badge]:
https://scan.coverity.com/projects/5555/badge.svg?flat=1
......
set(LABEL_EXPR "$ENV{label_exp}")
if ("${LABEL_EXPR}" MATCHES "gcc")
if ("${LABEL_EXPR}" MATCHES "gcc" OR "${LABEL_EXPR}" MATCHES "gcovr")
message(STATUS "Set CXX to g++ based on label_expr content")
set(CMAKE_C_COMPILER "gcc" CACHE PATH "C compiler option")
set(CMAKE_CXX_COMPILER "g++" CACHE PATH "C++ compiler option")
......
......@@ -79,6 +79,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
- DEBUG
- TRACE
--with-address-sanitizer build with address sanitizer if available
--with-gcov build with gcov coverage enabled
Influential Environment Variables (only on first invocation):
CXX C++ compiler command
......@@ -222,6 +223,9 @@ while [ $# -ne 0 ]; do
--with-address-sanitizer)
append_cache_entry CAF_ENABLE_ADDRESS_SANITIZER BOOL yes
;;
--with-gcov)
append_cache_entry CAF_ENABLE_GCOV BOOL yes
;;
--no-memory-management)
append_cache_entry CAF_NO_MEM_MANAGEMENT BOOL yes
;;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment