FIx more linker errors.

TileDB-Inc · Sep 8, 2023 · 45c21cd · 45c21cd
1 parent 079bb30
commit 45c21cd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/cmake/Modules/FindMagic_EP.cmake b/cmake/Modules/FindMagic_EP.cmake
@@ -38,6 +38,9 @@ if(TILEDB_VCPKG)
   find_package(unofficial-libmagic CONFIG REQUIRED)
   set(libmagic_DICTIONARY ${unofficial-libmagic_DICTIONARY})
   add_library(libmagic ALIAS unofficial::libmagic::libmagic)
+  install_target_libs(unofficial::libmagic::libmagic)
+  install_target_libs(PCRE2::8BIT)
+  install_target_libs(PCRE2::POSIX)
   return()
 endif()
 

diff --git a/cmake/Modules/FindWebp_EP.cmake b/cmake/Modules/FindWebp_EP.cmake
@@ -31,6 +31,10 @@ if (TILEDB_VCPKG)
   find_package(Threads REQUIRED)
   find_package(WebP REQUIRED)
   install_target_libs(WebP::webp)
+  install_target_libs(WebP::webpdecoder)
+  install_target_libs(WebP::webpdemux)
+  install_target_libs(WebP::libwebpmux)
+  install_target_libs(WebP::sharpyuv)
   return()
 endif()
 

diff --git a/tiledb/CMakeLists.txt b/tiledb/CMakeLists.txt
@@ -454,6 +454,7 @@ if (WIN32 AND TILEDB_STATIC)
     ${TILEDB_CORE_SOURCES}
     ${TILEDB_EXTERNALS_SOURCES}
   )
+  add_dependencies(TILEDB_CORE_OBJECTS_STATIC gen_mgc_unarch)
 
   # Compile all core sources with PIC
   set_property(TARGET TILEDB_CORE_OBJECTS_STATIC PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -722,6 +723,7 @@ if(TILEDB_WEBP)
   target_link_libraries(TILEDB_CORE_OBJECTS_ILIB
     INTERFACE
     WebP::webp
+    WebP::sharpyuv
   )
   add_definitions(-DTILEDB_WEBP)
 endif()
@@ -1015,8 +1017,12 @@ if (TILEDB_STATIC)
   append_dep_lib(google-cloud-cpp::experimental-storage-grpc)
 
   append_dep_lib(libmagic)
+  append_dep_lib(unofficial::libmagic::libmagic)
+  append_dep_lib(PCRE2::8BIT)
+  append_dep_lib(PCRE2::POSIX)
   append_dep_lib(Crc32c::crc32c)
   append_dep_lib(WebP::webp)
+  append_dep_lib(WebP::sharpyuv)
 
 endif()