Merge branch 'master' into external_file_abi

5 files changed, 471 insertions, 369 deletions

diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL
index 2b5d137fc..9e7328e70 100644
--- a/ports/clapack/CONTROL
+++ b/ports/clapack/CONTROL
@@ -1,5 +1,5 @@
 Source: clapack
-Version: 3.2.1-9
+Version: 3.2.1-10
 Homepage: https://www.netlib.org/clapack
 Description: CLAPACK (f2c'ed version of LAPACK)
 Build-Depends: openblas (!osx)
diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake
index 002218eb8..0b5924ff4 100644
--- a/ports/clapack/FindLAPACK.cmake
+++ b/ports/clapack/FindLAPACK.cmake
@@ -1,237 +1,468 @@
-#.rst:
-# clapack config for vcpkg
-# ------------
-#
-# Find the clapack includes and library.
-#
-# Result Variables
-# ^^^^^^^^^^^^^^^^
-#
-# This script defines the following variables:
-#
-# ``CLAPACK_FOUND``
-#   True if clapack library found
-#
-# ``CLAPACK_VERSION``
-#   Containing the clapack version tag (manually defined)
-#
-# ``CLAPACK_INCLUDE_DIR``
-#   Location of clapack headers
-#
-# ``CLAPACK_LIBRARY``
-#   List of libraries to link with when using clapack
-#
-# Result Targets
-# ^^^^^^^^^^^^^^
-#
-# This script defines the following targets:
-#
-# ``clapack::clapack``
-#   Target to use clapack
-#
-# Compatibility Variables
-# ^^^^^^^^^^^^^^^^^^^^^^^
-#
-# This script defines the following variables for compatibility reasons:
-#
-# ``F2C_FOUND``
-#   True if f2c (fortran-to-c wrap layer) library found
-#
-# ``F2C_INCLUDE_DIR``
-#   Location of clapack headers
-#
-# ``F2C_LIBRARY``
-#   Library containing the fortran-to-c wrap layer, necessary for clapack and automatically included when used
-#
-# ``LAPACK_FOUND``
-#   True if clapack library found
-#
-# ``LAPACK_VERSION``
-#   Containing the clapack version tag (manually defined)
-#
-# ``LAPACK_INCLUDE_DIR``
-#   Location of clapack headers
-#
-# ``LAPACK_LIBRARY``
-#   List of libraries to link with when using clapack
-#
-# Compatibility Targets
-# ^^^^^^^^^^^^^^
-#
-# This script defines the following targets for compatibility reasons:
-#
-# ``lapack``
-#   Target to use lapack
-
-include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
-include(${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
-include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-include(${CMAKE_ROOT}/Modules/CMakeFindDependencyMacro.cmake)
-
-set(CLAPACK_VERSION "3.2.1")
-
-set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-find_dependency(Threads)
-
-if(UNIX)
-  find_library(ADDITIONAL_LAPACK_LIBRARY m)
-  set(PTHREAD_LINK_NAME "-pthread")
-endif()
-
-if(NOT F2C_LIBRARY)
-  find_library(F2C_LIBRARY_RELEASE NAMES f2c libf2c)
-  find_library(F2C_LIBRARY_DEBUG NAMES f2cd libf2cd)
-  select_library_configurations(F2C)
-
-  #keep a list of "pure" f2c libs, without dependencies
-  set(oF2C_LIBRARY_RELEASE ${F2C_LIBRARY_RELEASE})
-  set(oF2C_LIBRARY_DEBUG ${F2C_LIBRARY_DEBUG})
-  set(oF2C_LIBRARY ${F2C_LIBRARY})
-
-  list(APPEND F2C_LIBRARY ${ADDITIONAL_LAPACK_LIBRARY})
-endif()
-
-if(NOT LAPACK_LIBRARY)
-  find_library(LAPACK_LIBRARY_RELEASE NAMES lapack)
-  find_library(LAPACK_LIBRARY_DEBUG NAMES lapackd)
-
-  #keep a list of "pure" lapack libs, without dependencies
-  set(oLAPACK_LIBRARY_RELEASE ${LAPACK_LIBRARY_RELEASE})
-  set(oLAPACK_LIBRARY_DEBUG ${LAPACK_LIBRARY_DEBUG})
-  select_library_configurations(oLAPACK)
-
-  list(APPEND LAPACK_LIBRARY_RELEASE ${F2C_LIBRARY_RELEASE})
-  list(APPEND LAPACK_LIBRARY_DEBUG ${F2C_LIBRARY_DEBUG})
-
-  find_dependency(BLAS)
-  get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY IMPORTED_IMPLIB_RELEASE)
-  if(NOT _loc)
-    get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY LOCATION_RELEASE)
-  endif()
-  set(LAPACK_BLAS_LIBRARY_RELEASE ${_loc})
-  get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY IMPORTED_IMPLIB_DEBUG)
-  if(NOT _loc)
-    get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY LOCATION_DEBUG)
-  endif()
-  set(LAPACK_BLAS_LIBRARY_DEBUG ${_loc})
-  select_library_configurations(LAPACK_BLAS)
-  list(APPEND LAPACK_LIBRARY_RELEASE ${LAPACK_BLAS_LIBRARY_RELEASE})
-  list(APPEND LAPACK_LIBRARY_DEBUG ${LAPACK_BLAS_LIBRARY_DEBUG})
-
-  select_library_configurations(LAPACK)
-  list(APPEND LAPACK_LIBRARY Threads::Threads)
-endif()
-
-if(NOT F2C_INCLUDE_DIR)
-  find_path(F2C_INCLUDE_DIR NAMES f2c.h)
-endif()
-
-if(NOT LAPACK_INCLUDE_DIR)
-  find_path(LAPACK_INCLUDE_DIR NAMES clapack.h)
-endif()
-
-list(APPEND LAPACK_INCLUDE_DIR ${F2C_INCLUDE_DIR})
-set(LAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE)
-set(LAPACK_INCLUDE_DIRS "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE)
-set(CLAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE)
-set(CLAPACK_INCLUDE_DIRS "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE)
-set(F2C_INCLUDE_DIRS "${F2C_INCLUDE_DIR}" CACHE PATH "" FORCE)
-
-set(LAPACK_DLL_DIR ${LAPACK_INCLUDE_DIR})
-list(TRANSFORM LAPACK_DLL_DIR APPEND "/../bin")
-message(STATUS "LAPACK_DLL_DIR: ${LAPACK_DLL_DIR}")
-
-if(WIN32)
-  find_file(LAPACK_LIBRARY_RELEASE_DLL NAMES lapack.dll PATHS ${LAPACK_DLL_DIR})
-  find_file(LAPACK_LIBRARY_DEBUG_FOLDER NAMES lapackd.dll PATHS ${LAPACK_DLL_DIR})
-  find_file(F2C_LIBRARY_RELEASE_DLL NAMES f2c.dll libf2c.dll PATHS ${LAPACK_DLL_DIR})
-  find_file(F2C_LIBRARY_DEBUG_DLL NAMES f2cd.dll libf2cd.dll PATHS ${LAPACK_DLL_DIR})
-endif()
-
-set(LAPACK_BLAS_LIBRARY "${LAPACK_BLAS_LIBRARY}" CACHE STRING "" FORCE)
-set(F2C_LIBRARIES "${F2C_LIBRARY}" CACHE STRING "" FORCE)
-set(LAPACK_VERSION "${CLAPACK_VERSION}" CACHE STRING "" FORCE)
-set(LAPACK_LIBRARIES "${LAPACK_LIBRARY}" CACHE STRING "" FORCE)
-set(CLAPACK_LIBRARY "${LAPACK_LIBRARY}" CACHE STRING "" FORCE)
-set(CLAPACK_LIBRARIES "${LAPACK_LIBRARY}" CACHE STRING "" FORCE)
-
-set(LAPACK_LIBRARY "${LAPACK_LIBRARY}" CACHE STRING "" FORCE)
-set(F2C_LIBRARY "${F2C_LIBRARY}" CACHE STRING "" FORCE)
-set(LAPACK_LIBRARY_RELEASE "${LAPACK_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
-set(LAPACK_LIBRARY_DEBUG "${LAPACK_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
-set(F2C_LIBRARY_RELEASE "${F2C_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
-set(F2C_LIBRARY_DEBUG "${F2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
-
-find_package_handle_standard_args(CLAPACK DEFAULT_MSG CLAPACK_LIBRARY CLAPACK_INCLUDE_DIR)
-mark_as_advanced(CLAPACK_INCLUDE_DIR CLAPACK_LIBRARY)
-
-find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARY LAPACK_INCLUDE_DIR)
-mark_as_advanced(LAPACK_INCLUDE_DIR LAPACK_LIBRARY)
-
-find_package_handle_standard_args(F2C DEFAULT_MSG F2C_LIBRARY F2C_INCLUDE_DIR)
-mark_as_advanced(F2C_INCLUDE_DIR F2C_LIBRARY)
-
-#TARGETS
-if(CLAPACK_FOUND AND NOT TARGET clapack::clapack)
-  if(EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}")
-    add_library(clapack::clapack SHARED IMPORTED)
-    set_target_properties(clapack::clapack PROPERTIES
-      IMPORTED_LOCATION_RELEASE                 "${LAPACK_LIBRARY_RELEASE_DLL}"
-      IMPORTED_IMPLIB_RELEASE                   "${oLAPACK_LIBRARY_RELEASE}"
-      INTERFACE_INCLUDE_DIRECTORIES             "${LAPACK_INCLUDE_DIR}"
-      INTERFACE_LINK_LIBRARIES                  "$<$<NOT:$<CONFIG:DEBUG>>:${oF2C_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${oF2C_LIBRARY_DEBUG}>;$<$<NOT:$<CONFIG:DEBUG>>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${LAPACK_BLAS_LIBRARY_DEBUG}>;$<LINK_ONLY:${ADDITIONAL_LAPACK_LIBRARY}>;$<LINK_ONLY:${PTHREAD_LINK_NAME}>"
-      IMPORTED_CONFIGURATIONS                   Release
-      IMPORTED_LINK_INTERFACE_LANGUAGES         "C")
-    if(EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}")
-      set_property(TARGET clapack::clapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug)
-      set_target_properties(clapack::clapack PROPERTIES
-        IMPORTED_LOCATION_DEBUG                 "${LAPACK_LIBRARY_DEBUG_DLL}"
-        IMPORTED_IMPLIB_DEBUG                   "${oLAPACK_LIBRARY_DEBUG}")
-    endif()
-  else()
-    add_library(clapack::clapack UNKNOWN IMPORTED)
-    set_target_properties(clapack::clapack PROPERTIES
-      IMPORTED_LOCATION_RELEASE                 "${oLAPACK_LIBRARY_RELEASE}"
-      INTERFACE_INCLUDE_DIRECTORIES             "${LAPACK_INCLUDE_DIR}"
-      INTERFACE_LINK_LIBRARIES                  "$<$<NOT:$<CONFIG:DEBUG>>:${oF2C_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${oF2C_LIBRARY_DEBUG}>;$<$<NOT:$<CONFIG:DEBUG>>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${LAPACK_BLAS_LIBRARY_DEBUG}>;$<LINK_ONLY:${ADDITIONAL_LAPACK_LIBRARY}>;$<LINK_ONLY:${PTHREAD_LINK_NAME}>"
-      IMPORTED_CONFIGURATIONS                   Release
-      IMPORTED_LINK_INTERFACE_LANGUAGES         "C")
-    if(EXISTS "${LAPACK_LIBRARY_DEBUG}")
-      set_property(TARGET clapack::clapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug)
-      set_target_properties(clapack::clapack PROPERTIES
-        IMPORTED_LOCATION_DEBUG                 "${oLAPACK_LIBRARY_DEBUG}")
-    endif()
-  endif()
-endif()
-
-if(CLAPACK_FOUND AND NOT TARGET lapack)
-  if(EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}")
-    add_library(lapack SHARED IMPORTED)
-    set_target_properties(lapack PROPERTIES
-      IMPORTED_LOCATION_RELEASE                 "${LAPACK_LIBRARY_RELEASE_DLL}"
-      IMPORTED_IMPLIB_RELEASE                   "${oLAPACK_LIBRARY_RELEASE}"
-      INTERFACE_INCLUDE_DIRECTORIES             "${LAPACK_INCLUDE_DIR}"
-      INTERFACE_LINK_LIBRARIES                  "$<$<NOT:$<CONFIG:DEBUG>>:${oF2C_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${oF2C_LIBRARY_DEBUG}>;$<$<NOT:$<CONFIG:DEBUG>>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${LAPACK_BLAS_LIBRARY_DEBUG}>;$<LINK_ONLY:${ADDITIONAL_LAPACK_LIBRARY}>;$<LINK_ONLY:${PTHREAD_LINK_NAME}>"
-      IMPORTED_CONFIGURATIONS                   Release
-      IMPORTED_LINK_INTERFACE_LANGUAGES         "C")
-    if(EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}")
-      set_property(TARGET lapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug)
-      set_target_properties(lapack PROPERTIES
-        IMPORTED_LOCATION_DEBUG                 "${LAPACK_LIBRARY_DEBUG_DLL}"
-        IMPORTED_IMPLIB_DEBUG                   "${oLAPACK_LIBRARY_DEBUG}")
-    endif()
-  else()
-    add_library(lapack UNKNOWN IMPORTED)
-    set_target_properties(lapack PROPERTIES
-      IMPORTED_LOCATION_RELEASE                 "${oLAPACK_LIBRARY_RELEASE}"
-      INTERFACE_INCLUDE_DIRECTORIES             "${LAPACK_INCLUDE_DIR}"
-      IMPORTED_CONFIGURATIONS                   Release
-      INTERFACE_LINK_LIBRARIES                  "$<$<NOT:$<CONFIG:DEBUG>>:${oF2C_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${oF2C_LIBRARY_DEBUG}>;$<$<NOT:$<CONFIG:DEBUG>>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${LAPACK_BLAS_LIBRARY_DEBUG}>;$<LINK_ONLY:${ADDITIONAL_LAPACK_LIBRARY}>;$<LINK_ONLY:${PTHREAD_LINK_NAME}>"
-      IMPORTED_LINK_INTERFACE_LANGUAGES         "C")
-    if(EXISTS "${LAPACK_LIBRARY_DEBUG}")
-      set_property(TARGET lapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug)
-      set_target_properties(lapack PROPERTIES
-        IMPORTED_LOCATION_DEBUG                 "${oLAPACK_LIBRARY_DEBUG}")
-    endif()
-  endif()
-endif()
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying

+# file Copyright.txt or https://cmake.org/licensing for details.

+

+#[=======================================================================[.rst:

+FindLAPACK

+----------

+

+Find LAPACK library

+

+This module finds an installed fortran library that implements the

+LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).

+

+The approach follows that taken for the autoconf macro file,

+acx_lapack.m4 (distributed at

+http://ac-archive.sourceforge.net/ac-archive/acx_lapack.html).

+

+Input Variables

+^^^^^^^^^^^^^^^

+

+The following variables may be set to influence this module's behavior:

+

+``BLA_STATIC``

+  if ``ON`` use static linkage

+

+``BLA_VENDOR``

+  If set, checks only the specified vendor, if not set checks all the

+  possibilities.  List of vendors valid in this module:

+

+  * ``Intel10_32`` (intel mkl v10 32 bit)

+  * ``Intel10_64lp`` (intel mkl v10+ 64 bit, threaded code, lp64 model)

+  * ``Intel10_64lp_seq`` (intel mkl v10+ 64 bit, sequential code, lp64 model)

+  * ``Intel10_64ilp`` (intel mkl v10+ 64 bit, threaded code, ilp64 model)

+  * ``Intel10_64ilp_seq`` (intel mkl v10+ 64 bit, sequential code, ilp64 model)

+  * ``Intel`` (obsolete versions of mkl 32 and 64 bit)

+  * ``OpenBLAS``

+  * ``FLAME``

+  * ``ACML``

+  * ``Apple``

+  * ``NAS``

+  * ``Generic``

+

+``BLA_F95``

+  if ``ON`` tries to find BLAS95/LAPACK95

+

+Result Variables

+^^^^^^^^^^^^^^^^

+

+This module defines the following variables:

+

+``LAPACK_FOUND``

+  library implementing the LAPACK interface is found

+``LAPACK_LINKER_FLAGS``

+  uncached list of required linker flags (excluding -l and -L).

+``LAPACK_LIBRARIES``

+  uncached list of libraries (using full path name) to link against

+  to use LAPACK

+``LAPACK95_LIBRARIES``

+  uncached list of libraries (using full path name) to link against

+  to use LAPACK95

+``LAPACK95_FOUND``

+  library implementing the LAPACK95 interface is found

+

+.. note::

+

+  C or CXX must be enabled to use Intel MKL

+

+  For example, to use Intel MKL libraries and/or Intel compiler:

+

+  .. code-block:: cmake

+

+    set(BLA_VENDOR Intel10_64lp)

+    find_package(LAPACK)

+#]=======================================================================]

+

+set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})

+

+# Check the language being used

+if( NOT (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED OR CMAKE_Fortran_COMPILER_LOADED) )

+  if(LAPACK_FIND_REQUIRED)

+    message(FATAL_ERROR "FindLAPACK requires Fortran, C, or C++ to be enabled.")

+  else()

+    message(STATUS "Looking for LAPACK... - NOT found (Unsupported languages)")

+    return()

+  endif()

+endif()

+

+if (CMAKE_Fortran_COMPILER_LOADED)

+include(${CMAKE_ROOT}/Modules/CheckFortranFunctionExists.cmake)

+else ()

+include(${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)

+endif ()

+include(${CMAKE_ROOT}/Modules/CMakePushCheckState.cmake)

+include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)

+

+cmake_push_check_state()

+set(CMAKE_REQUIRED_QUIET ${LAPACK_FIND_QUIETLY})

+

+set(LAPACK_FOUND FALSE)

+set(LAPACK95_FOUND FALSE)

+

+# TODO: move this stuff to separate module

+

+macro(Check_Lapack_Libraries LIBRARIES _prefix _name _flags _list _blas _threads)

+# This macro checks for the existence of the combination of fortran libraries

+# given by _list.  If the combination is found, this macro checks (using the

+# Check_Fortran_Function_Exists macro) whether can link against that library

+# combination using the name of a routine given by _name using the linker

+# flags given by _flags.  If the combination of libraries is found and passes

+# the link test, LIBRARIES is set to the list of complete library paths that

+# have been found.  Otherwise, LIBRARIES is set to FALSE.

+

+# N.B. _prefix is the prefix applied to the names of all cached variables that

+# are generated internally and marked advanced by this macro.

+

+set(_libraries_work TRUE)

+set(${LIBRARIES})

+set(${LIBRARIES}_RELEASE)

+set(_combined_name)

+if (NOT _libdir)

+  if (WIN32)

+    set(_libdir ENV LIB)

+  elseif (APPLE)

+    set(_libdir ENV DYLD_LIBRARY_PATH)

+  else ()

+    set(_libdir ENV LD_LIBRARY_PATH)

+  endif ()

+endif ()

+

+list(APPEND _libdir "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")

+

+foreach(_library ${_list})

+  set(_combined_name ${_combined_name}_${_library})

+

+  if(_libraries_work)

+    if (BLA_STATIC)

+      if (WIN32)

+        set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})

+      endif ()

+      if (APPLE)

+        set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})

+      else ()

+        set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})

+      endif ()

+    else ()

+      if (CMAKE_SYSTEM_NAME STREQUAL "Linux")

+        # for ubuntu's libblas3gf and liblapack3gf packages

+        set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} .so.3gf)

+      endif ()

+    endif ()

+    find_library(${_prefix}_${_library}_LIBRARY_RELEASE

+      NAMES ${_library}

+      PATHS ${_libdir}

+      )

+    mark_as_advanced(${_prefix}_${_library}_LIBRARY_RELEASE)

+    find_library(${_prefix}_${_library}_LIBRARY_DEBUG

+      NAMES ${_library}d

+      PATHS ${_libdir}

+      )

+    mark_as_advanced(${_prefix}_${_library}_LIBRARY_DEBUG)

+    select_library_configurations(${_prefix}_${_library})

+    if(NOT ${_prefix}_${_library}_LIBRARY_RELEASE MATCHES "NOTFOUND")

+        set(${LIBRARIES}_RELEASE ${${LIBRARIES}_RELEASE} ${${_prefix}_${_library}_LIBRARY_RELEASE})

+    endif()

+    set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})

+    set(_libraries_work ${${_prefix}_${_library}_LIBRARY})

+  endif()

+endforeach()

+

+if(_libraries_work)

+  # Test this combination of libraries.

+  if(NOT "${_blas}" STREQUAL "")

+    string(GENEX_STRIP "${_blas}" _test_blas)

+  endif()

+  if(UNIX AND BLA_STATIC)

+    set(CMAKE_REQUIRED_LIBRARIES ${_flags} "-Wl,--start-group" ${${LIBRARIES}_RELEASE} ${_test_blas} "-Wl,--end-group" ${_threads})

+  else()

+    set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}_RELEASE} ${_test_blas} ${_threads})

+  endif()

+  #message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")

+  #message("DEBUG: _test_blas = ${_test_blas} former ${_blas}")

+  if (NOT CMAKE_Fortran_COMPILER_LOADED)

+    check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS)

+  else ()

+    check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)

+  endif ()

+  set(CMAKE_REQUIRED_LIBRARIES)

+  set(_test_blas)

+  set(_libraries_work ${${_prefix}${_combined_name}_WORKS})

+#  message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")

+endif()

+

+ if(_libraries_work)

+   set(${LIBRARIES} ${${LIBRARIES}} "${_blas}" ${_threads})

+ else()

+    set(${LIBRARIES} FALSE)

+ endif()

+

+endmacro()

+

+

+set(LAPACK_LINKER_FLAGS)

+set(LAPACK_LIBRARIES)

+set(LAPACK95_LIBRARIES)

+

+

+if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)

+  find_package(BLAS)

+else()

+  find_package(BLAS REQUIRED)

+endif()

+

+

+if(BLAS_FOUND)

+  set(LAPACK_LINKER_FLAGS ${BLAS_LINKER_FLAGS})

+  if (NOT $ENV{BLA_VENDOR} STREQUAL "")

+    set(BLA_VENDOR $ENV{BLA_VENDOR})

+  else ()

+    if(NOT BLA_VENDOR)

+      set(BLA_VENDOR "All")

+    endif()

+  endif ()

+

+#intel lapack

+if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")

+  if (NOT WIN32)

+    set(LAPACK_mkl_LM "-lm")

+    set(LAPACK_mkl_LDL "-ldl")

+  endif ()

+  if (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED)

+    if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)

+      find_PACKAGE(Threads)

+    else()

+      find_package(Threads REQUIRED)

+    endif()

+

+    if (BLA_VENDOR MATCHES "_64ilp")

+      set(LAPACK_mkl_ILP_MODE "ilp64")

+    else ()

+      set(LAPACK_mkl_ILP_MODE "lp64")

+    endif ()

+

+    set(LAPACK_SEARCH_LIBS "")

+

+    if (BLA_F95)

+      set(LAPACK_mkl_SEARCH_SYMBOL "cheev_f95")

+      set(_LIBRARIES LAPACK95_LIBRARIES)

+      set(_BLAS_LIBRARIES ${BLAS95_LIBRARIES})

+

+      # old

+      list(APPEND LAPACK_SEARCH_LIBS

+        "mkl_lapack95")

+      # new >= 10.3

+      list(APPEND LAPACK_SEARCH_LIBS

+        "mkl_intel_c")

+      list(APPEND LAPACK_SEARCH_LIBS

+        "mkl_lapack95_${LAPACK_mkl_ILP_MODE}")

+    else()

+      set(LAPACK_mkl_SEARCH_SYMBOL "cheev")

+      set(_LIBRARIES LAPACK_LIBRARIES)

+      set(_BLAS_LIBRARIES ${BLAS_LIBRARIES})

+

+      # old

+      list(APPEND LAPACK_SEARCH_LIBS

+        "mkl_lapack")

+    endif()

+

+    # First try empty lapack libs

+    if (NOT ${_LIBRARIES})

+      check_lapack_libraries(

+        ${_LIBRARIES}

+        LAPACK

+        ${LAPACK_mkl_SEARCH_SYMBOL}

+        ""

+        ""

+        "${_BLAS_LIBRARIES}"

+        ""

+        )

+    endif ()

+    # Then try the search libs

+    foreach (IT ${LAPACK_SEARCH_LIBS})

+      if (NOT ${_LIBRARIES})

+        check_lapack_libraries(

+          ${_LIBRARIES}

+          LAPACK

+          ${LAPACK_mkl_SEARCH_SYMBOL}

+          ""

+          "${IT}"

+          "${_BLAS_LIBRARIES}"

+          "${CMAKE_THREAD_LIBS_INIT};${LAPACK_mkl_LM};${LAPACK_mkl_LDL}"

+          )

+      endif ()

+    endforeach ()

+

+    unset(LAPACK_mkl_ILP_MODE)

+    unset(LAPACK_mkl_SEARCH_SYMBOL)

+    unset(LAPACK_mkl_LM)

+    unset(LAPACK_mkl_LDL)

+  endif ()

+endif()

+

+if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")

+ if(NOT LAPACK_LIBRARIES)

+  check_lapack_libraries(

+  LAPACK_LIBRARIES

+  LAPACK

+  cheev

+  ""

+  "goto2"

+  "${BLAS_LIBRARIES}"

+  ""

+  )

+ endif()

+endif ()

+

+if (BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All")

+ if(NOT LAPACK_LIBRARIES)

+  check_lapack_libraries(

+  LAPACK_LIBRARIES

+  LAPACK

+  cheev

+  ""

+  "openblas"

+  "${BLAS_LIBRARIES}"

+  ""

+  )

+ endif()

+endif ()

+

+if (BLA_VENDOR STREQUAL "FLAME" OR BLA_VENDOR STREQUAL "All")

+ if(NOT LAPACK_LIBRARIES)

+  check_lapack_libraries(

+  LAPACK_LIBRARIES

+  LAPACK

+  cheev

+  ""

+  "flame"

+  "${BLAS_LIBRARIES}"

+  ""

+  )

+ endif()

+endif ()

+

+#acml lapack

+ if (BLA_VENDOR MATCHES "ACML" OR BLA_VENDOR STREQUAL "All")

+   if (BLAS_LIBRARIES MATCHES ".+acml.+")

+     set (LAPACK_LIBRARIES ${BLAS_LIBRARIES})

+   endif ()

+ endif ()

+

+# Apple LAPACK library?

+if (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")

+ if(NOT LAPACK_LIBRARIES)

+  check_lapack_libraries(

+  LAPACK_LIBRARIES

+  LAPACK

+  cheev

+  ""

+  "Accelerate"

+  "${BLAS_LIBRARIES}"

+  ""

+  )

+ endif()

+endif ()

+if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")

+  if ( NOT LAPACK_LIBRARIES )

+    check_lapack_libraries(

+    LAPACK_LIBRARIES

+    LAPACK

+    cheev

+    ""

+    "vecLib"

+    "${BLAS_LIBRARIES}"

+    ""

+    )

+  endif ()

+endif ()

+# Generic LAPACK library?

+if (BLA_VENDOR STREQUAL "Generic" OR

+    BLA_VENDOR STREQUAL "ATLAS" OR

+    BLA_VENDOR STREQUAL "All")

+  if ( NOT LAPACK_LIBRARIES )

+    check_lapack_libraries(

+    LAPACK_LIBRARIES

+    LAPACK

+    cheev

+    ""

+    "lapack"

+    "${BLAS_LIBRARIES}"

+    ""

+    )

+  endif ()

+  if ( NOT LAPACK_LIBRARIES )

+    check_lapack_libraries(

+    LAPACK_LIBRARIES

+    LAPACK

+    cheev

+    ""

+    "lapack;libf2c"

+    "${BLAS_LIBRARIES}"

+    ""

+    )

+  endif ()

+  if ( NOT LAPACK_LIBRARIES )

+    check_lapack_libraries(

+    LAPACK_LIBRARIES

+    LAPACK

+    cheev

+    ""

+    "lapack;f2c"

+    "${BLAS_LIBRARIES}"

+    ""

+    )

+  endif ()

+endif ()

+

+else()

+  message(STATUS "LAPACK requires BLAS")

+endif()

+

+if(BLA_F95)

+ if(LAPACK95_LIBRARIES)

+  set(LAPACK95_FOUND TRUE)

+ else()

+  set(LAPACK95_FOUND FALSE)

+ endif()

+ if(NOT LAPACK_FIND_QUIETLY)

+  if(LAPACK95_FOUND)

+    message(STATUS "A library with LAPACK95 API found.")

+  else()

+    if(LAPACK_FIND_REQUIRED)

+      message(FATAL_ERROR

+      "A required library with LAPACK95 API not found. Please specify library location."

+      )

+    else()

+      message(STATUS

+      "A library with LAPACK95 API not found. Please specify library location."

+      )

+    endif()

+  endif()

+ endif()

+ set(LAPACK_FOUND "${LAPACK95_FOUND}")

+ set(LAPACK_LIBRARIES "${LAPACK95_LIBRARIES}")

+else()

+ if(LAPACK_LIBRARIES)

+  set(LAPACK_FOUND TRUE)

+ else()

+  set(LAPACK_FOUND FALSE)

+ endif()

+

+ if(NOT LAPACK_FIND_QUIETLY)

+  if(LAPACK_FOUND)

+    message(STATUS "A library with LAPACK API found.")

+  else()

+    if(LAPACK_FIND_REQUIRED)

+      message(FATAL_ERROR

+      "A required library with LAPACK API not found. Please specify library location."

+      )

+    else()

+      message(STATUS

+      "A library with LAPACK API not found. Please specify library location."

+      )

+    endif()

+  endif()

+ endif()

+endif()

+

+cmake_pop_check_state()

+set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})

diff --git a/ports/clapack/enable_openblas_compat.patch b/ports/clapack/enable_openblas_compat.patch
deleted file mode 100644
index 319935475..000000000
--- a/ports/clapack/enable_openblas_compat.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/INCLUDE/blaswrap.h b/INCLUDE/blaswrap.h
-index 333a17a..fb6750a 100644
---- a/INCLUDE/blaswrap.h
-+++ b/INCLUDE/blaswrap.h
-@@ -155,6 +155,107 @@
- #define ctrsm_ f2c_ctrsm
- #define ztrsm_ f2c_ztrsm
- 
-+#else
-+
-+#define sswap_    sswap
-+#define saxpy_    saxpy
-+#define sasum_    sasum
-+#define isamax_   isamax
-+#define scopy_    scopy
-+#define sscal_    sscal
-+#define sger_     sger
-+#define snrm2_    snrm2
-+#define ssymv_    ssymv
-+#define sdot_     sdot
-+#define saxpy_    saxpy
-+#define ssyr2_    ssyr2
-+#define srot_     srot
-+#define sgemv_    sgemv
-+#define strsv_    strsv
-+#define sgemm_    sgemm
-+#define strsm_    strsm
-+
-+#define dswap_    dswap
-+#define daxpy_    daxpy
-+#define dasum_    dasum
-+#define idamax_   idamax
-+#define dcopy_    dcopy
-+#define dscal_    dscal
-+#define dger_     dger
-+#define dnrm2_    dnrm2
-+#define dsymv_    dsymv
-+#define ddot_     ddot
-+#define dsyr2_    dsyr2
-+#define drot_     drot
-+#define dgemv_    dgemv
-+#define dtrsv_    dtrsv
-+#define dgemm_    dgemm
-+#define dtrsm_    dtrsm
-+
-+#define cswap_    cswap
-+#define caxpy_    caxpy
-+#define scasum_   scasum
-+#define icamax_   icamax
-+#define ccopy_    ccopy
-+#define cscal_    cscal
-+#define scnrm2_   scnrm2
-+#define cgemv_    cgemv
-+#define ctrsv_    ctrsv
-+#define cgemm_    cgemm
-+#define ctrsm_    ctrsm
-+#define cgerc_    cgerc
-+#define chemv_    chemv
-+#define cher2_    cher2
-+
-+#define zswap_    zswap
-+#define zaxpy_    zaxpy
-+#define dzasum_   dzasum
-+#define izamax_   izamax
-+#define zcopy_    zcopy
-+#define zscal_    zscal
-+#define dznrm2_   dznrm2
-+#define zgemv_    zgemv
-+#define ztrsv_    ztrsv
-+#define zgemm_    zgemm
-+#define ztrsm_    ztrsm
-+#define zgerc_    zgerc
-+#define zhemv_    zhemv
-+#define zher2_    zher2
-+
-+/* LAPACK */
-+#define dlacon_   dlacon
-+#define slacon_   slacon
-+#define icmax1_   icmax1
-+#define scsum1_   scsum1
-+#define clacon_   clacon
-+#define dzsum1_   dzsum1
-+#define izmax1_   izmax1
-+#define zlacon_   zlacon
-+
-+/* Fortran interface */
-+#define c_bridge_dgssv_ c_bridge_dgssv
-+#define c_fortran_sgssv_ c_fortran_sgssv
-+#define c_fortran_dgssv_ c_fortran_dgssv
-+#define c_fortran_cgssv_ c_fortran_cgssv
-+#define c_fortran_zgssv_ c_fortran_zgssv
-+
-+#define cdotc_ cdotc
-+#define cdotu_ cdotu
-+#define csscal_ csscal
-+#define zdscal_ zdscal
-+#define zdotc_ zdotc
-+#define zdotu_ zdotu
-+#define ctrmm_ ctrmm
-+#define dtrmm_ dtrmm
-+#define strmm_ strmm
-+#define ztrmm_ ztrmm
-+#define cgeru_ cgeru
-+#define zgeru_ zgeru
-+#define xerbla_ xerbla
-+#define dtrmv_ dtrmv
-+#define dsyrk_ dsyrk
-+#define zherk_ zherk
-+
- #endif /* NO_BLAS_WRAP */
- 
- #endif /* __BLASWRAP_H */
diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake
index 2845bbdc2..90169d79b 100644
--- a/ports/clapack/portfile.cmake
+++ b/ports/clapack/portfile.cmake
@@ -1,11 +1,5 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-  message(WARNING "You do not need this package on macOS, since you already have the Accelerate Framework")
-  return()
-endif()
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_download_distfile(ARCHIVE
@@ -14,16 +8,11 @@ vcpkg_download_distfile(ARCHIVE
   SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49
 )
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  set(ADDITIONAL_PATCH "enable_openblas_compat.patch")
-endif()
-
 vcpkg_extract_source_archive_ex(
   OUT_SOURCE_PATH SOURCE_PATH
   ARCHIVE ${ARCHIVE}
   PATCHES
       remove_internal_blas.patch
-      ${ADDITIONAL_PATCH}
 )
 
 vcpkg_configure_cmake(
@@ -37,7 +26,7 @@ vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
 #TODO: fix the official exported targets, since they are broken (luckily it seems that no-one uses them for now)
-vcpkg_fixup_cmake_targets()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/clapack)
 
 #we install a cmake wrapper since the official FindLAPACK module in cmake does find clapack easily, unfortunately...
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack)
diff --git a/ports/clapack/vcpkg-cmake-wrapper.cmake b/ports/clapack/vcpkg-cmake-wrapper.cmake
index aee3e1e08..26a0a1624 100644
--- a/ports/clapack/vcpkg-cmake-wrapper.cmake
+++ b/ports/clapack/vcpkg-cmake-wrapper.cmake
@@ -1,8 +1,2 @@
-set(LAPACK_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+include(${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake)
 
-if(NOT LAPACK_LIBRARIES)
-  _find_package(${ARGS})
-endif()
-
-set(CMAKE_MODULE_PATH ${LAPACK_PREV_MODULE_PATH})