This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/509-remove-install-of-v2-headers in repository https://gitbox.apache.org/repos/asf/celix.git
commit a8221389eafa2394f51abdf2edd85d6918dd97b5 Author: Pepijn Noltes <[email protected]> AuthorDate: Sun Oct 1 13:24:48 2023 +0200 #509: Remove installation of utils/fw deprecated headers --- CMakeLists.txt | 5 ++--- conanfile.py | 2 ++ libs/framework/CMakeLists.txt | 3 --- libs/utils/CMakeLists.txt | 4 ---- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 955f61d4..8357dab5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,7 +157,6 @@ if (ENABLE_TESTING) enable_testing() endif() -option(CELIX_INSTALL_DEPRECATED_API "whether to install (and use) deprecated apis (i.e. header without a celix_ prefix." ON) option(CELIX_USE_ZIP_INSTEAD_OF_JAR "Default Celix cmake command will use jar to package bundle (if found). This option enforces Celix to use zip instead." OFF) option(CELIX_CXX14 "Build C++14 libraries and bundles. Note for tests C++ is always used." ON) @@ -170,9 +169,9 @@ option(ENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11 "Test the Dependency Manager option(ENABLE_TESTING_FOR_CXX14 "Test celix utils and framework C++ header for C++14 support" OFF) option(ENABLE_CMAKE_WARNING_TESTS "Enable cmake warning tests to test warning prints" OFF) option(ENABLE_TESTING_ON_CI "Whether to enable testing on CI. This influence allowed timing errors during unit tests" OFF) +option(ENABLE_DEPRECATED_WARNINGS "Enable compiler warnings for usage of deprecated functionality" OFF) -if (CELIX_INSTALL_DEPRECATED_API) - #ignore deprecated warnings +if (NOT ENABLE_DEPRECATED_WARNINGS) set(CMAKE_C_FLAGS "-Wno-deprecated-declarations ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "-Wno-deprecated-declarations ${CMAKE_CXX_FLAGS}") endif () diff --git a/conanfile.py b/conanfile.py index f28dae63..c294bf34 100644 --- a/conanfile.py +++ b/conanfile.py @@ -105,6 +105,7 @@ class CelixConan(ConanFile): "enable_testing_on_ci": False, "framework_curlinit": True, "enable_ccache": False, + "enable_deprecated_warnings": False, } options = { "celix_err_buffer_size": ["ANY"], @@ -152,6 +153,7 @@ class CelixConan(ConanFile): del self.info.options.enable_cmake_warning_tests del self.info.options.enable_testing_on_ci del self.info.options.enable_ccache + del self.info.optoins.enable_deprecated_warnings def build_requirements(self): if self.options.enable_testing: diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt index 64d7d2f6..2c97b9de 100644 --- a/libs/framework/CMakeLists.txt +++ b/libs/framework/CMakeLists.txt @@ -75,9 +75,6 @@ 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) - 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 diff --git a/libs/utils/CMakeLists.txt b/libs/utils/CMakeLists.txt index aec9403a..cb037619 100644 --- a/libs/utils/CMakeLists.txt +++ b/libs/utils/CMakeLists.txt @@ -105,10 +105,6 @@ if (UTILS) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/utils/ COMPONENT framework) - if (CELIX_INSTALL_DEPRECATED_API) - install(DIRECTORY include_deprecated/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/utils COMPONENT framework) - endif () - #Alias setup to match external usage add_library(Celix::utils ALIAS utils)
