Skip to content
Snippets Groups Projects
Commit 6de6359c authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Merge branch 'feature/cmake-update' into 'develop'

Feature/cmake update

See merge request !58
parents d57153cf 77c364bb
No related branches found
No related tags found
1 merge request!58Feature/cmake update
...@@ -79,6 +79,12 @@ if(NOT CMAKE_BUILD_TYPE) ...@@ -79,6 +79,12 @@ if(NOT CMAKE_BUILD_TYPE)
FORCE) FORCE)
endif() endif()
#------------------------------------------------------
# default build shared libraries
if (NOT BUILD_SHARED_LIBS)
set(BUILD_SHARED_LIBS ON CACHE STRING "" FORCE)
endif()
#------------------------------------------------------ #------------------------------------------------------
# Checks if compiler version is compatible with Pugs sources # Checks if compiler version is compatible with Pugs sources
...@@ -365,7 +371,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Coverage") ...@@ -365,7 +371,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Coverage")
ALL # in coverage mode we do coverage! ALL # in coverage mode we do coverage!
# zero all counters # zero all counters
COMMAND ${FASTCOV} -q -z COMMAND ${FASTCOV} -q -z --gcov "${GCOV_BIN}"
# Run tests # Run tests
COMMAND ${CMAKE_CTEST_COMMAND} COMMAND ${CMAKE_CTEST_COMMAND}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment