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 2019/04/26 19:23:21 UTC
[celix] branch develop updated: CELIX-426: Fixes UUID lib setup in
celix_framework
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/develop by this push:
new 51a9305 CELIX-426: Fixes UUID lib setup in celix_framework
51a9305 is described below
commit 51a9305202f1f21c915a8030c03b22df87b57c8a
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Fri Apr 26 21:22:57 2019 +0200
CELIX-426: Fixes UUID lib setup in celix_framework
---
examples/celix-examples/track_tracker_example/src/activator.c | 1 -
libs/framework/CMakeLists.txt | 4 ++--
libs/framework/src/service_tracker.c | 1 -
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/examples/celix-examples/track_tracker_example/src/activator.c b/examples/celix-examples/track_tracker_example/src/activator.c
index f8f675b..0eba4dc 100644
--- a/examples/celix-examples/track_tracker_example/src/activator.c
+++ b/examples/celix-examples/track_tracker_example/src/activator.c
@@ -92,7 +92,6 @@ celix_status_t activator_start(activator_data_t* act, celix_bundle_context_t *ct
celix_status_t activator_stop(activator_data_t* act, celix_bundle_context_t *ctx) {
celix_bundleContext_unregisterService(ctx, act->svcId);
- usleep(1000);
celix_bundleContext_stopTracker(ctx, act->calcTrk1);
celix_bundleContext_stopTracker(ctx, act->calcTrk2);
usleep(1000);
diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt
index 9ba007f..e853d22 100644
--- a/libs/framework/CMakeLists.txt
+++ b/libs/framework/CMakeLists.txt
@@ -41,7 +41,7 @@ target_include_directories(framework PUBLIC
target_compile_options(framework PRIVATE -DUSE_FILE32API)
set_target_properties(framework PROPERTIES "SOVERSION" 2)
target_link_libraries(framework PUBLIC Celix::utils)
-target_link_libraries(framework PRIVATE ${UUID} ${ZLIB_LIBRARY} ${CURL_LIBRARIES})
+target_link_libraries(framework PRIVATE ${UUID_LIBRARY} ${ZLIB_LIBRARY} ${CURL_LIBRARIES})
install(TARGETS framework EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT framework)
install(DIRECTORY include/ DESTINATION include/celix COMPONENT framework)
@@ -169,7 +169,7 @@ if (ENABLE_TESTING AND FRAMEWORK_TESTS)
private/mock/celix_log_mock.c
src/framework.c
src/celix_library_loader.c)
- target_link_libraries(framework_test ${CPPUTEST_LIBRARY} ${CPPUTEST_EXT_LIBRARY} ${UUID} Celix::utils pthread dl)
+ target_link_libraries(framework_test ${CPPUTEST_LIBRARY} ${CPPUTEST_EXT_LIBRARY} ${UUID_LIBRARY} Celix::utils pthread dl)
add_executable(manifest_parser_test
private/test/manifest_parser_test.cpp
diff --git a/libs/framework/src/service_tracker.c b/libs/framework/src/service_tracker.c
index 8c3ecba..9a5cc9e 100644
--- a/libs/framework/src/service_tracker.c
+++ b/libs/framework/src/service_tracker.c
@@ -769,7 +769,6 @@ celix_service_tracker_t* celix_serviceTracker_createWithOptions(
}
- //TODO open on other thread?
serviceTracker_open(tracker);
}
} else {