[celix] branch feature/civetweb_integration updated: Make civetweb shared library loadable when build in the Celix project.

[pengzheng]

This is an automated email from the ASF dual-hosted git repository.

pengzheng pushed a commit to branch feature/civetweb_integration
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/feature/civetweb_integration 
by this push:
     new dcc06f5d Make civetweb shared library loadable when build in the Celix 
project.
dcc06f5d is described below

commit dcc06f5df6c49951efb4d67d6870b6c68a572932
Author: PengZheng <howto...@gmail.com>
AuthorDate: Sat Feb 4 21:53:44 2023 +0800

    Make civetweb shared library loadable when build in the Celix project.
---
 bundles/pubsub/integration/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/pubsub/integration/CMakeLists.txt 
b/bundles/pubsub/integration/CMakeLists.txt
index 851af12b..a1276e68 100644
--- a/bundles/pubsub/integration/CMakeLists.txt
+++ b/bundles/pubsub/integration/CMakeLists.txt
@@ -346,7 +346,7 @@ if (PUBSUB_INTEGRATION)
                 pubsub_tst
                 pubsub_serializer
                 )
-        target_link_libraries(pubsub_websocket_v2_tests PRIVATE 
Celix::pubsub_api jansson::jansson GTest::gtest GTest::gtest_main)
+        target_link_libraries(pubsub_websocket_v2_tests PRIVATE 
Celix::pubsub_api jansson::jansson GTest::gtest GTest::gtest_main 
civetweb::civetweb)
         target_include_directories(pubsub_websocket_v2_tests SYSTEM PRIVATE 
gtest)
         add_test(NAME pubsub_websocket_v2_tests COMMAND 
pubsub_websocket_v2_tests WORKING_DIRECTORY 
$<TARGET_PROPERTY:pubsub_websocket_v2_tests,CONTAINER_LOC>)
         setup_target_for_coverage(pubsub_websocket_v2_tests SCAN_DIR ..)
@@ -368,7 +368,7 @@ if (PUBSUB_INTEGRATION)
                 pubsub_serializer
                 )
         target_compile_definitions(pstm_deadlock_websocket_v2_test PRIVATE 
-DDEADLOCK_SUT_BUNDLE_FILE=\"${DEADLOCK_SUT_BUNDLE_FILE}\")
-        target_link_libraries(pstm_deadlock_websocket_v2_test PRIVATE 
Celix::pubsub_api GTest::gtest GTest::gtest_main jansson::jansson Celix::dfi)
+        target_link_libraries(pstm_deadlock_websocket_v2_test PRIVATE 
Celix::pubsub_api GTest::gtest GTest::gtest_main jansson::jansson Celix::dfi 
civetweb::civetweb)
         target_include_directories(pstm_deadlock_websocket_v2_test SYSTEM 
PRIVATE pstm_deadlock_websocket_v2_test)
 
         #Note we do not link to bundles, as result (to ensure a bundle zip 
file is created) an dependency on the bundle is needed.