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 f9a23d73 Build civetweb shared object.
f9a23d73 is described below
commit f9a23d73c619675666960d83de75b9bad256373e
Author: PengZheng <[email protected]>
AuthorDate: Sat Feb 4 21:24:08 2023 +0800
Build civetweb shared object.
---
.../remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt | 5 +++++
cmake/Findcivetweb.cmake | 1 +
2 files changed, 6 insertions(+)
diff --git
a/bundles/remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt
b/bundles/remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt
index 9021431a..8a9db3ac 100644
--- a/bundles/remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt
+++ b/bundles/remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt
@@ -41,6 +41,7 @@ add_executable(test_rsa_dfi
target_include_directories(test_rsa_dfi PRIVATE src)
celix_deprecated_utils_headers(test_rsa_dfi)
target_link_libraries(test_rsa_dfi PRIVATE
+ civetweb::civetweb
CURL::libcurl
Celix::framework
Celix::rsa_common
@@ -66,6 +67,10 @@ add_celix_bundle_dependencies(test_rsa_dfi
rsa_dfi #note depend on the target creating the bundle zip not the lib
target
calculator
remote_example_service
+ calculator_shell
+ rsa_discovery
+ Celix::rsa_topology_manager
+ rsa_dfi_tst_bundle
)
add_test(NAME run_test_rsa_dfi COMMAND test_rsa_dfi)
diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
index 33f449bb..46310ed1 100644
--- a/cmake/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -20,6 +20,7 @@ if (NOT civetweb_FOUND)
include(FetchContent)
set(CIVETWEB_ENABLE_WEBSOCKETS TRUE CACHE BOOL "" FORCE)
set(CIVETWEB_BUILD_TESTING FALSE CACHE BOOL "" FORCE)
+ set(BUILD_SHARED_LIBS TRUE CACHE BOOL "" FORCE)
FetchContent_Declare(
civetweb
GIT_REPOSITORY https://github.com/civetweb/civetweb.git
