From 71c9792c6cd2dc3da5f993876c2fc7ac62366360 Mon Sep 17 00:00:00 2001 From: Gabriele Contini <contini.mailing@gmail.com> Date: 周日, 08 3月 2020 22:13:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feature/pc_identifiers --- src/library/base/CMakeLists.txt | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/library/base/CMakeLists.txt b/src/library/base/CMakeLists.txt index 0a61fdf..f0f9588 100644 --- a/src/library/base/CMakeLists.txt +++ b/src/library/base/CMakeLists.txt @@ -1,11 +1,20 @@ -ADD_LIBRARY(base STATIC +ADD_LIBRARY(base OBJECT EventRegistry.cpp StringUtils.cpp - FileUtils.cpp + file_utils.cpp + base64.cpp logger.c - base64.c ) -add_dependencies( base public_key ) +add_dependencies( base project_initialize ) -install(TARGETS base ARCHIVE DESTINATION lib) +if(CODE_COVERAGE AND UNIX) + MESSAGE(STATUS "Enabling code coverage") + target_compile_options(base PUBLIC + -O0 # no optimization + -g # generate debug info + --coverage # sets all required flags + ) +endif(CODE_COVERAGE AND UNIX) + + -- Gitblit v1.9.1