This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch feature/579-automatic-dependency-deduction in repository https://gitbox.apache.org/repos/asf/celix.git
commit ba204b1617e5a927b6dc1024e9477b326ba7687d Author: PengZheng <[email protected]> AuthorDate: Tue Jul 11 16:11:29 2023 +0800 Improve deprecated header dependency specification. --- .../remote_service_admin_shm_v2/rsa_shm/CMakeLists.txt | 1 + .../remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt | 1 + bundles/remote_services/rsa_spi/CMakeLists.txt | 3 --- libs/framework/CMakeLists.txt | 4 +++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/CMakeLists.txt b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/CMakeLists.txt index 83614021..b7189afc 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/CMakeLists.txt +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/CMakeLists.txt @@ -57,6 +57,7 @@ add_library(Celix::rsa_shm ALIAS rsa_shm) if (ENABLE_TESTING) add_library(rsa_shm_cut STATIC ${RSA_SHM_SRC}) celix_deprecated_utils_headers(rsa_shm_cut) + celix_deprecated_framework_headers(rsa_shm_cut) target_include_directories(rsa_shm_cut PUBLIC src) target_link_libraries(rsa_shm_cut PUBLIC ${RSA_SHM_DEPS}) add_subdirectory(gtest) diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt index dddf7d17..26357f3f 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt @@ -82,6 +82,7 @@ if (LINKER_WRAP_SUPPORTED) add_celix_bundle_dependencies(unit_test_rsa_shm Celix::rsa_json_rpc) celix_deprecated_utils_headers(unit_test_rsa_shm) + celix_deprecated_framework_headers(unit_test_rsa_shm) add_test(NAME run_unit_test_rsa_shm COMMAND unit_test_rsa_shm) setup_target_for_coverage(unit_test_rsa_shm SCAN_DIR ..) diff --git a/bundles/remote_services/rsa_spi/CMakeLists.txt b/bundles/remote_services/rsa_spi/CMakeLists.txt index 8836c6c4..6b60f7b4 100644 --- a/bundles/remote_services/rsa_spi/CMakeLists.txt +++ b/bundles/remote_services/rsa_spi/CMakeLists.txt @@ -17,12 +17,9 @@ add_library(c_rsa_spi INTERFACE) -get_target_property(FRAMEWORK_SOURCE_DIR Celix::framework "SOURCE_DIR") target_include_directories(c_rsa_spi INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> - $<BUILD_INTERFACE:${FRAMEWORK_SOURCE_DIR}/include_deprecated>##TODO remove when deprecated header service_reference.h is removed ) -set_property(TARGET celix-deprecated APPEND PROPERTY "FRAMEWORK_TARGETS" c_rsa_spi) target_link_libraries(c_rsa_spi INTERFACE Celix::framework) install(TARGETS c_rsa_spi EXPORT celix COMPONENT rsa diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt index 103ab406..6fb8d6a6 100644 --- a/libs/framework/CMakeLists.txt +++ b/libs/framework/CMakeLists.txt @@ -64,7 +64,9 @@ if (FRAMEWORK) install(TARGETS framework EXPORT celix LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT framework INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/framework) install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/framework COMPONENT framework) - install(DIRECTORY include_deprecated/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/framework COMPONENT framework) + if (CELIX_INSTALL_DEPRECATED_API) + install(DIRECTORY include_deprecated/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/framework COMPONENT framework) + endif () install(DIRECTORY ${CMAKE_BINARY_DIR}/celix/gen/includes/framework/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/framework COMPONENT framework) #Alias setup to match external usage
