From cff0d60fb97c65397c4e8b4df2e2540126e4bfee Mon Sep 17 00:00:00 2001 From: Filippo Brizzi Date: Fri, 2 Feb 2024 10:20:55 +0000 Subject: [PATCH 1/3] changed just the package config --- install/PackageConfig.cmake.in | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/install/PackageConfig.cmake.in b/install/PackageConfig.cmake.in index e66109fea..c37c93280 100644 --- a/install/PackageConfig.cmake.in +++ b/install/PackageConfig.cmake.in @@ -16,22 +16,32 @@ add_library(__zenohc_static STATIC IMPORTED GLOBAL) add_library(zenohc::static ALIAS __zenohc_static) -set_property(TARGET __zenohc_static PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/@STATICLIB@") target_link_libraries(__zenohc_static INTERFACE @NATIVE_STATIC_LIBS@) -target_include_directories(__zenohc_static INTERFACE "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@") +set_target_properties(__zenohc_static PROPERTIES + IMPORTED_LOCATION "${_IMPORT_PREFIX}/@CMAKE_INSTALL_LIBDIR@/@STATICLIB@" + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@" +) +# target_include_directories(__zenohc_static INTERFACE "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@") add_library(__zenohc_shared SHARED IMPORTED GLOBAL) add_library(zenohc::shared ALIAS __zenohc_shared) -set_target_properties(__zenohc_shared PROPERTIES IMPORTED_NO_SONAME TRUE) -set_property(TARGET __zenohc_shared PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/@DYLIB@") +set_target_properties(__zenohc_shared PROPERTIES + IMPORTED_NO_SONAME TRUE + INTERFACE_COMPILE_DEFINITION ZENOHC_DYN_LIB + IMPORTED_LOCATION "${_IMPORT_PREFIX}/@CMAKE_INSTALL_LIBDIR@/@DYLIB@" + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@" +) + +# set_target_properties(__zenohc_shared PROPERTIES IMPORTED_NO_SONAME TRUE) +# set_property(TARGET __zenohc_shared PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/@DYLIB@") if(NOT ("@IMPLIB@" STREQUAL "")) set_property(TARGET __zenohc_shared PROPERTY IMPORTED_IMPLIB "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/@IMPLIB@") endif() -target_include_directories(__zenohc_shared INTERFACE "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@") -target_compile_definitions(__zenohc_shared INTERFACE ZENOHC_DYN_LIB) +# target_include_directories(__zenohc_shared INTERFACE "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@") +# target_compile_definitions(__zenohc_shared INTERFACE ZENOHC_DYN_LIB) if(ZENOHC_LIB_STATIC) add_library(zenohc::lib ALIAS __zenohc_static) else() add_library(zenohc::lib ALIAS __zenohc_shared) -endif() \ No newline at end of file +endif() From e5f9f3128f8eb187234ef68eaf98ee6bd487b0c9 Mon Sep 17 00:00:00 2001 From: Filippo Brizzi Date: Fri, 2 Feb 2024 10:38:55 +0000 Subject: [PATCH 2/3] working prob --- install/PackageConfig.cmake.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/install/PackageConfig.cmake.in b/install/PackageConfig.cmake.in index c37c93280..d5fd50b44 100644 --- a/install/PackageConfig.cmake.in +++ b/install/PackageConfig.cmake.in @@ -14,6 +14,15 @@ @PACKAGE_INIT@ +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + add_library(__zenohc_static STATIC IMPORTED GLOBAL) add_library(zenohc::static ALIAS __zenohc_static) target_link_libraries(__zenohc_static INTERFACE @NATIVE_STATIC_LIBS@) @@ -35,7 +44,7 @@ set_target_properties(__zenohc_shared PROPERTIES # set_target_properties(__zenohc_shared PROPERTIES IMPORTED_NO_SONAME TRUE) # set_property(TARGET __zenohc_shared PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/@DYLIB@") if(NOT ("@IMPLIB@" STREQUAL "")) - set_property(TARGET __zenohc_shared PROPERTY IMPORTED_IMPLIB "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/@IMPLIB@") + set_property(TARGET __zenohc_shared PROPERTY IMPORTED_IMPLIB "${_IMPORT_PREFIX}/@CMAKE_INSTALL_LIBDIR@/@IMPLIB@") endif() # target_include_directories(__zenohc_shared INTERFACE "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@") # target_compile_definitions(__zenohc_shared INTERFACE ZENOHC_DYN_LIB) From df4682bd397723a62853dae62cdf65305c08958d Mon Sep 17 00:00:00 2001 From: Filippo Brizzi Date: Fri, 2 Feb 2024 11:03:16 +0000 Subject: [PATCH 3/3] removed commented code --- install/PackageConfig.cmake.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/install/PackageConfig.cmake.in b/install/PackageConfig.cmake.in index d5fd50b44..13fd98f5d 100644 --- a/install/PackageConfig.cmake.in +++ b/install/PackageConfig.cmake.in @@ -30,7 +30,6 @@ set_target_properties(__zenohc_static PROPERTIES IMPORTED_LOCATION "${_IMPORT_PREFIX}/@CMAKE_INSTALL_LIBDIR@/@STATICLIB@" INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@" ) -# target_include_directories(__zenohc_static INTERFACE "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@") add_library(__zenohc_shared SHARED IMPORTED GLOBAL) add_library(zenohc::shared ALIAS __zenohc_shared) @@ -41,13 +40,9 @@ set_target_properties(__zenohc_shared PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@" ) -# set_target_properties(__zenohc_shared PROPERTIES IMPORTED_NO_SONAME TRUE) -# set_property(TARGET __zenohc_shared PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/@DYLIB@") if(NOT ("@IMPLIB@" STREQUAL "")) set_property(TARGET __zenohc_shared PROPERTY IMPORTED_IMPLIB "${_IMPORT_PREFIX}/@CMAKE_INSTALL_LIBDIR@/@IMPLIB@") endif() -# target_include_directories(__zenohc_shared INTERFACE "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@") -# target_compile_definitions(__zenohc_shared INTERFACE ZENOHC_DYN_LIB) if(ZENOHC_LIB_STATIC) add_library(zenohc::lib ALIAS __zenohc_static)