Merge remote-tracking branch 'origin/dev' into mrexodia-msvc-find-lib

2022-05-03 00:08:47 +02:00
parent 1f4bdaf6e0 95ecfead48
commit 42e52cd4c7
4 changed files with 62 additions and 7 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1361,6 +1361,10 @@ endif()

 # Black magic for generating static archives...
 if (BUILD_SHARED_LIBS)
+    if (MSVC)
+        # Avoid the import lib built by MVSC clash with our archive.
+        set_target_properties(unicorn PROPERTIES ARCHIVE_OUTPUT_NAME "unicorn-import")
+    endif()
    bundle_static_library(unicorn_static unicorn_archive unicorn)
 else()
    # Rename the "static" lib to avoid filename clash.