You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2020/04/23 19:15:47 UTC
[celix] 02/02: Update setup coverage cmake commands
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/pubsub_custom_serializers
in repository https://gitbox.apache.org/repos/asf/celix.git
commit dc24b6c5e079587d722669b163d3405804202896
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Thu Apr 23 21:15:29 2020 +0200
Update setup coverage cmake commands
---
.github/workflows/build.yml | 0
bundles/pubsub/pubsub_serializer_avrobin/gtest/CMakeLists.txt | 2 +-
bundles/pubsub/pubsub_serializer_json/gtest/CMakeLists.txt | 2 +-
bundles/pubsub/pubsub_utils/gtest/CMakeLists.txt | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/bundles/pubsub/pubsub_serializer_avrobin/gtest/CMakeLists.txt b/bundles/pubsub/pubsub_serializer_avrobin/gtest/CMakeLists.txt
index 0987526..7431bbb 100644
--- a/bundles/pubsub/pubsub_serializer_avrobin/gtest/CMakeLists.txt
+++ b/bundles/pubsub/pubsub_serializer_avrobin/gtest/CMakeLists.txt
@@ -39,5 +39,5 @@ target_compile_definitions(test_pubsub_serializer_avrobin PRIVATE -DSER_BUNDLE=\
target_compile_definitions(test_pubsub_serializer_avrobin PRIVATE -DDESCRIPTOR_BUNDLE=\"$<TARGET_PROPERTY:pubsub_avrobin_serialization_descriptor,BUNDLE_FILE>\")
add_test(NAME test_pubsub_serializer_avrobin COMMAND test_pubsub_serializer_avrobin)
-SETUP_TARGET_FOR_COVERAGE(test_pubsub_serializer_avrobin_cov test_pubsub_serializer_avrobin ${CMAKE_BINARY_DIR}/coverage/pubsub/pubsub_serializer_avrobin ..)
+setup_target_for_coverage(test_pubsub_serializer_avrobin SCAN_DIR ..)
diff --git a/bundles/pubsub/pubsub_serializer_json/gtest/CMakeLists.txt b/bundles/pubsub/pubsub_serializer_json/gtest/CMakeLists.txt
index 0e7104d..eb7e448 100644
--- a/bundles/pubsub/pubsub_serializer_json/gtest/CMakeLists.txt
+++ b/bundles/pubsub/pubsub_serializer_json/gtest/CMakeLists.txt
@@ -39,5 +39,5 @@ target_compile_definitions(test_pubsub_serializer_json PRIVATE -DSER_BUNDLE=\"$<
target_compile_definitions(test_pubsub_serializer_json PRIVATE -DDESCRIPTOR_BUNDLE=\"$<TARGET_PROPERTY:pubsub_json_serialization_descriptor,BUNDLE_FILE>\")
add_test(NAME test_pubsub_serializer_json COMMAND test_pubsub_serializer_json)
-SETUP_TARGET_FOR_COVERAGE(test_pubsub_serializer_json_cov test_pubsub_serializer_json ${CMAKE_BINARY_DIR}/coverage/pubsub/pubsub_serializer_json ..)
+setup_target_for_coverage(test_pubsub_serializer_json SCAN_DIR ..)
diff --git a/bundles/pubsub/pubsub_utils/gtest/CMakeLists.txt b/bundles/pubsub/pubsub_utils/gtest/CMakeLists.txt
index 79f10bd..8d23a3b 100644
--- a/bundles/pubsub/pubsub_utils/gtest/CMakeLists.txt
+++ b/bundles/pubsub/pubsub_utils/gtest/CMakeLists.txt
@@ -35,7 +35,7 @@ add_executable(test_pubsub_utils
target_link_libraries(test_pubsub_utils PRIVATE Celix::framework Celix::pubsub_utils GTest::GTest GTest::Main)
target_compile_options(test_pubsub_utils PRIVATE -std=c++14) #Note test code is allowed to be C++14
add_test(NAME test_pubsub_utils COMMAND test_pubsub_utils)
-SETUP_TARGET_FOR_COVERAGE(test_pubsub_utils_cov test_pubsub_utils ${CMAKE_BINARY_DIR}/coverage/pubsub/pubsub_utils ..)
+setup_target_for_coverage(test_pubsub_utils SCAN_DIR ..)
add_dependencies(test_pubsub_utils pubsub_serialization_provider_descriptors_bundle)
target_compile_definitions(test_pubsub_utils PRIVATE -DDESCRIPTOR_BUNDLE=\"$<TARGET_PROPERTY:pubsub_serialization_provider_descriptors,BUNDLE_FILE>\")
\ No newline at end of file