Merge branch 'main' into fixwininstalldir

eclipse-zenoh · Jul 18, 2024 · 555ed5e · 555ed5e
2 parents 499478e + 9c25f8d
commit 555ed5e
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/install/PackageConfig.cmake.in b/install/PackageConfig.cmake.in
@@ -23,29 +23,35 @@ 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@)
-set_target_properties(__zenohc_static PROPERTIES
-    IMPORTED_LOCATION "${_IMPORT_PREFIX}/@CMAKE_INSTALL_LIBDIR@/@STATICLIB@"
-    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@"
-)
+if(NOT TARGET __zenohc_static)
+  add_library(__zenohc_static STATIC IMPORTED GLOBAL)
+  add_library(zenohc::static ALIAS __zenohc_static)
+  target_link_libraries(__zenohc_static INTERFACE @NATIVE_STATIC_LIBS@)
+  set_target_properties(__zenohc_static PROPERTIES
+      IMPORTED_LOCATION "${_IMPORT_PREFIX}/@CMAKE_INSTALL_LIBDIR@/@STATICLIB@"
+      INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@"
+  )
+endif()
 
-add_library(__zenohc_shared SHARED IMPORTED GLOBAL)
-add_library(zenohc::shared ALIAS __zenohc_shared)
-set_target_properties(__zenohc_shared PROPERTIES
-    IMPORTED_NO_SONAME TRUE
-    INTERFACE_COMPILE_DEFINITION ZENOHC_DYN_LIB
-    IMPORTED_LOCATION "${_IMPORT_PREFIX}/@ZENOHC_INSTALL_DYLIBDIR@/@DYLIB@"
-    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@"
-)
+if(NOT TARGET __zenohc_shared)
+  add_library(__zenohc_shared SHARED IMPORTED GLOBAL)
+  add_library(zenohc::shared ALIAS __zenohc_shared)
+  set_target_properties(__zenohc_shared PROPERTIES
+      IMPORTED_NO_SONAME TRUE
+      INTERFACE_COMPILE_DEFINITION ZENOHC_DYN_LIB
+      IMPORTED_LOCATION "${_IMPORT_PREFIX}/@ZENOHC_INSTALL_DYLIBDIR@/@DYLIB@"
+      INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@"
+  )
+endif()
 
 if(NOT ("@IMPLIB@" STREQUAL ""))
     set_property(TARGET __zenohc_shared PROPERTY IMPORTED_IMPLIB "${_IMPORT_PREFIX}/@CMAKE_INSTALL_LIBDIR@/@IMPLIB@")
 endif()
 
-if(ZENOHC_LIB_STATIC)
+if(NOT TARGET zenohc::lib)
+  if(ZENOHC_LIB_STATIC)
     add_library(zenohc::lib ALIAS __zenohc_static)
-else()
+  else()
     add_library(zenohc::lib ALIAS __zenohc_shared)
+  endif()
 endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -2,6 +2,8 @@ message(STATUS "zenoh-c tests")
 
 add_custom_target(tests)
 
+find_package(Threads REQUIRED)
+
 file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.c")
 foreach(file ${files})
     get_filename_component(target ${file} NAME_WE)
@@ -20,7 +22,7 @@ foreach(file ${files})
     add_executable(${target} EXCLUDE_FROM_ALL ${file})
     add_dependencies(tests ${target})
     add_dependencies(${target} zenohc::lib)
-    target_link_libraries(${target} PRIVATE zenohc::lib)
+    target_link_libraries(${target} PRIVATE zenohc::lib Threads::Threads)
     copy_dlls(${target})
     set_property(TARGET ${target} PROPERTY C_STANDARD 11)
     add_test(NAME "${test_type}_${target}" COMMAND ${target})