This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch feature/conan_support in repository https://gitbox.apache.org/repos/asf/celix.git
commit 1e9e20a15a8bdb81b30ac26d801e830f909a9008 Author: PengZheng <[email protected]> AuthorDate: Wed Mar 9 22:47:13 2022 +0800 Package modules improvements. Avoid redefining libzip::libzip and support Jansson target for etcdlib. --- cmake/Modules/FindLIBZIP.cmake | 2 +- libs/etcdlib/cmake/FindJansson.cmake | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/FindLIBZIP.cmake b/cmake/Modules/FindLIBZIP.cmake index b25835f..34710dd 100644 --- a/cmake/Modules/FindLIBZIP.cmake +++ b/cmake/Modules/FindLIBZIP.cmake @@ -37,7 +37,7 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LIBZIP DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR) -if(LIBZIP_FOUND) +if(LIBZIP_FOUND AND NOT TARGET libzip::libzip) add_library(libzip::libzip IMPORTED STATIC GLOBAL) set_target_properties(libzip::libzip PROPERTIES IMPORTED_LOCATION "${LIBZIP_LIBRARY}" diff --git a/libs/etcdlib/cmake/FindJansson.cmake b/libs/etcdlib/cmake/FindJansson.cmake index bedf8be..45ee311 100644 --- a/libs/etcdlib/cmake/FindJansson.cmake +++ b/libs/etcdlib/cmake/FindJansson.cmake @@ -21,7 +21,7 @@ # JANSSON_FOUND - System has Jansson # JANSSON_INCLUDE_DIRS - The Jansson include directories # JANSSON_LIBRARIES - The libraries needed to use Jansson -# JANSSON_DEFINITIONS - Compiler switches required for using Jansson +# Jansson - Imported target for Jansson find_path(JANSSON_INCLUDE_DIR jansson.h /usr/include @@ -39,4 +39,19 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Jansson DEFAULT_MSG JANSSON_LIBRARY JANSSON_INCLUDE_DIR) -mark_as_advanced(JANSSON_INCLUDE_DIR JANSSON_LIBRARY ) \ No newline at end of file +mark_as_advanced(JANSSON_INCLUDE_DIR JANSSON_LIBRARY) + +if (JANSSON_FOUND AND NOT TARGET Jansson) + add_library(Jansson SHARED IMPORTED) + set_target_properties(Jansson PROPERTIES + IMPORTED_LOCATION "${JANSSON_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${JANSSON_INCLUDE_DIR}" + ) + +endif () + +#For backward compatability +set(JANSSON_LIBRARY ${JANSSON_LIBRARY}) +set(JANSSON_LIBRARIES ${JANSSON_LIBRARY}) +set(JANSSON_INCLUDE_DIR ${JANSSON_INCLUDE_DIR}) +set(JANSSON_INCLUDE_DIRS ${JANSSON_INCLUDE_DIR})
