install fix

eclipse-zenoh · Sep 8, 2023 · 226d023 · 226d023
1 parent 5dc0f8b
commit 226d023
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -199,7 +199,6 @@ function(set_target_imported_locations target lib libd)
 	set_target_properties(${target}
 		PROPERTIES
 		IMPORTED_GLOBAL TRUE
-		# IMPORTED_LOCATION $<IF:$<CONFIG:Debug>,${cargo_binary_dir_debug}/${libd},${cargo_binary_dir_release}/${lib}>
 		IMPORTED_LOCATION_DEBUG ${cargo_binary_dir_debug}/${libd}
 		IMPORTED_LOCATION_RELEASE ${cargo_binary_dir_release}/${lib}
 		IMPORTED_LOCATION_MINSIZEREL ${cargo_binary_dir_release}/${lib}
@@ -211,7 +210,6 @@ function(set_target_imported_implib target lib libd)
 	set_target_properties(${target}
 		PROPERTIES
 		IMPORTED_GLOBAL TRUE
-		# IMPORTED_IMPLIB $<IF:$<CONFIG:Debug>,${cargo_binary_dir_debug}/${lib},${cargo_binary_dir_release}/${lib}>
 		IMPORTED_IMPLIB_DEBUG ${cargo_binary_dir_debug}/${libd}
 		IMPORTED_IMPLIB_RELEASE ${cargo_binary_dir_release}/${lib}
 		IMPORTED_IMPLIB_MINSIZEREL ${cargo_binary_dir_release}/${lib}

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
@@ -12,11 +12,15 @@ status_print(CMAKE_INSTALL_PREFIX)
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
-function(install_zenohc_lib configurations property_postfix package_name libname_postfix)
+function(install_zenohc_lib configurations property_postfix package_name)
     get_target_property(dylib_path zenohc::lib IMPORTED_LOCATION_${property_postfix})
     get_target_property_if_set(implib_path zenohc::lib IMPORTED_IMPLIB_${property_postfix})
     get_target_property(staticlib_path zenohc::static IMPORTED_LOCATION_${property_postfix})
 
+    get_filename_component(DYLIB ${dylib_path} NAME)
+    get_filename_component(IMPLIB ${implib_path} NAME)
+    get_filename_component(STATICLIB ${staticlib_path} NAME)
+
     # Install dynamic, import and static library
     install(FILES ${dylib_path} DESTINATION ${CMAKE_INSTALL_LIBDIR} CONFIGURATIONS ${configurations})
     if(DEFINED implib_path)
@@ -48,7 +52,7 @@ function(install_zenohc_lib configurations property_postfix package_name libname
         COMPONENT dev)
 
     if(APPLE OR UNIX)
-        set(LIBNAME_POSTFIX ${libname_postfix})
+        get_filename_component(LIBNAME ${DYLIB} NAME_WE)
         configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zenohc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${package_name}.pc @ONLY)
         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${package_name}.pc 
             DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" 
@@ -69,5 +73,5 @@ endforeach()
 #
 # Install lib files 
 #
-install_zenohc_lib("Release;RelWithDebInfo;MinSizeRel" "RELEASE" zenohc "")
-install_zenohc_lib("Debug" "DEBUG" zenohc_debug "d")
+install_zenohc_lib("Release;RelWithDebInfo;MinSizeRel" "RELEASE" zenohc)
+install_zenohc_lib("Debug" "DEBUG" zenohc_debug)