diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake index b32e5cf81db31a..908a52815be66c 100644 --- a/ports/intel-mkl/portfile.cmake +++ b/ports/intel-mkl/portfile.cmake @@ -237,6 +237,12 @@ endif() file(COPY "${mkl_dir}/lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}" "bin") +if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "static") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "define_param(MKL_LINK DEFAULT_MKL_LINK MKL_LINK_LIST)" +[[define_param(MKL_LINK DEFAULT_MKL_LINK MKL_LINK_LIST) + set(MKL_LINK "static") +]]) +endif() #TODO: Hardcode settings from portfile in config.cmake #TODO: Give lapack/blas information about the correct BLA_VENDOR depending on settings. diff --git a/ports/intel-mkl/vcpkg.json b/ports/intel-mkl/vcpkg.json index 391acf9481629a..fc0a76ecb30b50 100644 --- a/ports/intel-mkl/vcpkg.json +++ b/ports/intel-mkl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "intel-mkl", "version": "2023.0.0", - "port-version": 4, + "port-version": 5, "description": "Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors.", "homepage": "https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 165bf8168be340..afe6179342ac70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3754,7 +3754,7 @@ }, "intel-mkl": { "baseline": "2023.0.0", - "port-version": 4 + "port-version": 5 }, "intelrdfpmathlib": { "baseline": "20U2", diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json index ee320e2539ef1f..8465767753e325 100644 --- a/versions/i-/intel-mkl.json +++ b/versions/i-/intel-mkl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4be49a487c0c55a67bb79fa1d90be6b515b99f67", + "version": "2023.0.0", + "port-version": 5 + }, { "git-tree": "ca06d4f88eaf67a10c1b988c5a2e3d8a74741d66", "version": "2023.0.0",