Skip to content

Feature/442 export headers bundle libs #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 30, 2023
Merged

Feature/442 export headers bundle libs #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
be34f24
Add hide symbols config for static bundles libs
pnoltes Jun 24, 2023
fac303e
Remove hide symbols from rsa_common
pnoltes Jun 28, 2023
b0339ba
Revert "Remove hide symbols from rsa_common"
PengZheng Jun 29, 2023
55b76b6
Fix testing issue caused by `celix_target_hide_symbols(rsa_common)`.
PengZheng Jun 29, 2023
740fe55
Add the "hide symbols" configuration to remaining shared library unde…
PengZheng Jun 29, 2023
5d0e47d
Fix standalone etcdlib build error.
PengZheng Jun 29, 2023
b6a4713
Apply symbol visibility control for standalone etcdlib.
PengZheng Jun 29, 2023
17035e0
Revert "Apply symbol visibility control for standalone etcdlib."
PengZheng Jun 29, 2023
7e9911b
Revert "Fix standalone etcdlib build error."
PengZheng Jun 29, 2023
84934ab
Revert "Add the "hide symbols" configuration to remaining shared libr…
PengZheng Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bundles/pubsub/pubsub_spi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ target_link_libraries(pubsub_spi PUBLIC Celix::framework Celix::pubsub_api)
target_link_libraries(pubsub_spi PUBLIC Celix::pubsub_utils libuuid::libuuid)
celix_deprecated_utils_headers(pubsub_spi)
celix_deprecated_framework_headers(pubsub_spi)
celix_target_hide_symbols(pubsub_spi)

add_library(Celix::pubsub_spi ALIAS pubsub_spi)

install(TARGETS pubsub_spi EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT pubsub
Expand Down
1 change: 1 addition & 0 deletions bundles/pubsub/pubsub_utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ target_link_libraries(pubsub_utils PUBLIC Celix::framework Celix::dfi Celix::pub
target_link_libraries(pubsub_utils PRIVATE Celix::pubsub_spi)
celix_deprecated_utils_headers(pubsub_utils)
celix_deprecated_framework_headers(pubsub_utils)
celix_target_hide_symbols(pubsub_utils)

add_library(Celix::pubsub_utils ALIAS pubsub_utils)

Expand Down
2 changes: 1 addition & 1 deletion bundles/remote_services/discovery_zeroconf/gtest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ if (LINKER_WRAP_SUPPORTED)

target_link_libraries(unit_test_discovery_zeroconf PRIVATE
rsa_discovery_zeroconf_cut
Celix::rsa_common
rsa_common_cut
Celix::c_rsa_spi
Celix::framework
Celix::threads_ei
Expand Down
2 changes: 1 addition & 1 deletion bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if (LINKER_WRAP_SUPPORTED)
target_link_libraries(unit_test_rsa_shm PRIVATE
rsa_shm_cut
Celix::c_rsa_spi
Celix::rsa_common
rsa_common_cut
Celix::log_helper
Celix::framework
Celix::threads_ei
Expand Down
19 changes: 14 additions & 5 deletions bundles/remote_services/rsa_common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,31 @@
# specific language governing permissions and limitations
# under the License.

add_library(rsa_common STATIC
src/endpoint_description.c
src/export_registration_impl.c
src/import_registration_impl.c
src/remote_interceptors_handler.c)
set(RSA_COMMON_SRC
src/endpoint_description.c
src/export_registration_impl.c
src/import_registration_impl.c
src/remote_interceptors_handler.c
)

add_library(rsa_common STATIC ${RSA_COMMON_SRC})
set_target_properties(rsa_common PROPERTIES OUTPUT_NAME "celix_rsa_common")
target_include_directories(rsa_common PRIVATE src)
target_link_libraries(rsa_common PUBLIC Celix::framework Celix::c_rsa_spi Celix::log_helper)
celix_deprecated_utils_headers(rsa_common)
celix_deprecated_framework_headers(rsa_common)
celix_target_hide_symbols(rsa_common)

install(TARGETS rsa_common EXPORT celix COMPONENT rsa DESTINATION ${CMAKE_INSTALL_LIBDIR})

#Setup target aliases to match external usage
add_library(Celix::rsa_common ALIAS rsa_common)

if (ENABLE_TESTING)
add_library(rsa_common_cut STATIC ${RSA_COMMON_SRC})
target_include_directories(rsa_common_cut PUBLIC src)
target_link_libraries(rsa_common_cut PUBLIC Celix::framework Celix::c_rsa_spi Celix::log_helper)
celix_deprecated_utils_headers(rsa_common_cut)
celix_deprecated_framework_headers(rsa_common_cut)
add_subdirectory(gtest)
endif()
2 changes: 1 addition & 1 deletion bundles/remote_services/rsa_common/gtest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if (LINKER_WRAP_SUPPORTED)
)

target_link_libraries(unit_test_rsa_common PRIVATE
Celix::rsa_common
rsa_common_cut
Celix::rsa_spi
Celix::framework
Celix::utils
Expand Down
1 change: 1 addition & 0 deletions bundles/remote_services/rsa_dfi_utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ target_include_directories(rsa_dfi_utils PUBLIC
target_include_directories(rsa_dfi_utils PRIVATE src)
target_link_libraries(rsa_dfi_utils PUBLIC Celix::framework Celix::log_helper Celix::dfi)
celix_deprecated_utils_headers(rsa_dfi_utils)
celix_target_hide_symbols(rsa_dfi_utils)

#Setup target aliases to match external usage
add_library(Celix::rsa_dfi_utils ALIAS rsa_dfi_utils)
Expand Down
2 changes: 1 addition & 1 deletion bundles/remote_services/rsa_rpc_json/gtest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if (LINKER_WRAP_SUPPORTED)
target_link_libraries(unit_test_rsa_json_rpc PRIVATE
rsa_json_rpc_cut
Celix::c_rsa_spi
Celix::rsa_common
rsa_common_cut
Celix::framework
Celix::bundle_ei
Celix::malloc_ei
Expand Down
2 changes: 1 addition & 1 deletion bundles/remote_services/thpool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
add_library(thpool STATIC
src/thpool.c
)

celix_target_hide_symbols(thpool)
target_include_directories(thpool PUBLIC include)

add_library(Celix::thpool ALIAS thpool)