Install zenohc.dll in <prefix>/bin on Windows (#471)

eclipse-zenoh · Jul 18, 2024 · c75ce16 · c75ce16
1 parent 9c25f8d
commit c75ce16
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
@@ -23,7 +23,15 @@ function(install_zenohc_lib configurations property_postfix package_name)
     get_filename_component(STATICLIB ${staticlib_path} NAME)
 
     # Install dynamic, import and static library
-    install(FILES ${dylib_path} DESTINATION ${CMAKE_INSTALL_LIBDIR} CONFIGURATIONS ${configurations})
+
+    # On Windows .dll need to be installed in ${CMAKE_INSTALL_BINDIR}, 
+    # while on Linux and macOS .so and .dylib need to be installed in ${CMAKE_INSTALL_LIBDIR}
+    if(WIN32)
+        set(ZENOHC_INSTALL_DYLIBDIR ${CMAKE_INSTALL_BINDIR})
+    else()
+        set(ZENOHC_INSTALL_DYLIBDIR ${CMAKE_INSTALL_LIBDIR})
+    endif()
+    install(FILES ${dylib_path} DESTINATION ${ZENOHC_INSTALL_DYLIBDIR} CONFIGURATIONS ${configurations})
     if(DEFINED implib_path)
         install(FILES ${implib_path} DESTINATION ${CMAKE_INSTALL_LIBDIR} CONFIGURATIONS ${configurations})
     endif()

diff --git a/install/PackageConfig.cmake.in b/install/PackageConfig.cmake.in
@@ -39,7 +39,7 @@ if(NOT TARGET __zenohc_shared)
   set_target_properties(__zenohc_shared PROPERTIES
       IMPORTED_NO_SONAME TRUE
       INTERFACE_COMPILE_DEFINITION ZENOHC_DYN_LIB
-      IMPORTED_LOCATION "${_IMPORT_PREFIX}/@CMAKE_INSTALL_LIBDIR@/@DYLIB@"
+      IMPORTED_LOCATION "${_IMPORT_PREFIX}/@ZENOHC_INSTALL_DYLIBDIR@/@DYLIB@"
       INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@"
   )
 endif()