xxx

Author: andrea-iob

external/CBLAS/cmake/FindCBLAS.cmake

@@ -448,8 +448,6 @@ if (NOT TARGET CBLAS::CBLAS)
                 endif()
 
                 message(" CHECKING ${CANDIDATE_LIBRARY_DLL_PATH}")
-
-
             endforeach()
         elseif (LIBRARY_EXTENSION STREQUAL ".so")
             set(TARGET_TYPE "SHARED")

external/LAPACKE/cmake/FindLAPACKE.cmake

@@ -459,12 +459,25 @@ if (NOT TARGET LAPACKE::LAPACKE)
             set(TARGET_TYPE "STATIC")
             set(TARGET_IMPORTED_LOCATION "${LIBRARY_PATH}")
             foreach(LIBRARY_DLL_SEARCH_PATH IN LISTS LIBRARY_DLL_SEARCH_PATHS)
-                set(CANDIDATE_LIBRARY_DLL_PATH "${LIBRARY_DLL_SEARCH_PATH}/${LIBRARY_BASENAME}.dll")
+                string(REGEX REPLACE "_dll$" "" CANDIDATE_LIBRARY_DLL_PATH "${LIBRARY_BASENAME}")
+                set(CANDIDATE_LIBRARY_DLL_PATH "${LIBRARY_DLL_SEARCH_PATH}/${CANDIDATE_LIBRARY_DLL_PATH}.dll")
                 if(EXISTS "${CANDIDATE_LIBRARY_DLL_PATH}")
                     set(TARGET_TYPE "SHARED")
                     set(TARGET_IMPORTED_LOCATION "${CANDIDATE_LIBRARY_DLL_PATH}")
                     break()
                 endif()
+
+                message(" CHECKING ${CANDIDATE_LIBRARY_DLL_PATH}")
+
+                string(REGEX REPLACE "_dll$" "" CANDIDATE_LIBRARY_DLL_PATH "${LIBRARY_BASENAME}")
+                set(CANDIDATE_LIBRARY_DLL_PATH "${LIBRARY_DLL_SEARCH_PATH}/${CANDIDATE_LIBRARY_DLL_PATH}.2.dll")
+                if(EXISTS "${CANDIDATE_LIBRARY_DLL_PATH}")
+                    set(TARGET_TYPE "SHARED")
+                    set(TARGET_IMPORTED_LOCATION "${CANDIDATE_LIBRARY_DLL_PATH}")
+                    break()
+                endif()
+
+                message(" CHECKING ${CANDIDATE_LIBRARY_DLL_PATH}")
             endforeach()
         elseif (LIBRARY_EXTENSION STREQUAL ".so")
             set(TARGET_TYPE "SHARED")