diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0602fe294..150bdd7d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2079,7 +2079,7 @@ if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
         PATHS ${CMAKE_SYSTEM_LIBRARY_PATH} /opt/local/lib /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib /opt/local/lib64
     )
     if(ARPACK_LIBRARY)
-        target_link_libraries(Armadillo::armadillo INTERFACE ARPACK_LIBRARY)
+        target_link_libraries(Armadillo::armadillo INTERFACE ${ARPACK_LIBRARY})
     endif()
 endif()
 
diff --git a/cmake/Modules/FindLIBUNWIND.cmake b/cmake/Modules/FindLIBUNWIND.cmake
index 610c54f34..f2c88b569 100644
--- a/cmake/Modules/FindLIBUNWIND.cmake
+++ b/cmake/Modules/FindLIBUNWIND.cmake
@@ -31,7 +31,7 @@ find_path(LIBUNWIND_INCLUDE_DIR
 
 find_library(LIBUNWIND_GENERIC_LIBRARY
     NAMES
-        libunwind.a
+        libunwind
         unwind
     HINTS
         /usr
@@ -68,7 +68,7 @@ if(LIBUNWIND_INCLUDE_DIR)
         if(LIBUNWIND_ARCH)
             find_library(LIBUNWIND_SPECIFIC_LIBRARY
                 NAMES
-                    libunwind-${LIBUNWIND_ARCH}.a
+                    libunwind-${LIBUNWIND_ARCH}
                     "unwind-${LIBUNWIND_ARCH}"
                 HINTS
                     /usr
@@ -113,13 +113,20 @@ if(LIBUNWIND_FOUND)
 endif()
 
 if(LIBUNWIND_FOUND AND NOT TARGET Libunwind::libunwind)
-    add_library(Libunwind::libunwind INTERFACE IMPORTED)
-    set_target_properties(Libunwind::libunwind PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-        IMPORTED_LOCATION "${LIBUNWIND_LIBRARIES}"
-        INTERFACE_INCLUDE_DIRECTORIES "${LIBUNWIND_INCLUDE_DIR}"
-        INTERFACE_LINK_LIBRARIES "${LIBUNWIND_LIBRARIES}"
-    )
+    if(LIBUNWIND_GENERIC_LIBRARY)
+        add_library(Libunwind::libunwind SHARED IMPORTED)
+        set_target_properties(Libunwind::libunwind PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+            IMPORTED_LOCATION "${LIBUNWIND_GENERIC_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${LIBUNWIND_INCLUDE_DIR}"
+            INTERFACE_LINK_LIBRARIES "${LIBUNWIND_LIBRARIES}"
+        )
+    else()
+        add_library(Libunwind::libunwind INTERFACE IMPORTED)
+        set_target_properties(Libunwind::libunwind PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${LIBUNWIND_INCLUDE_DIR}"
+        )
+    endif()
 endif()
 
 set_package_properties(LIBUNWIND PROPERTIES