diff --git a/ports/blaze/fix-vm-build.patch b/ports/blaze/fix-vm-build.patch deleted file mode 100644 index 3936299e0a..0000000000 --- a/ports/blaze/fix-vm-build.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5ab1f460..a23c6dbf5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -145,12 +145,13 @@ if (${BLAZE_CACHE_SIZE_AUTO}) - endif (flag EQUAL 0) - endif (APPLE) - -- if (flag) -+ string(REGEX MATCH "([0-9][0-9]+)" tmp ${tmp}) # Get a number containing at least 2 digits in the string tmp -+ -+ if (flag OR NOT tmp) - message("Cache size not found automatically. Using default value as cache size.") - set(tmp ${BLAZE_CACHE_SIZE_DEFAULT}) - endif (flag) - -- string(REGEX MATCH "([0-9][0-9]+)" tmp ${tmp}) # Get a number containing at least 2 digits in the string tmp - math(EXPR BLAZE_CACHE_SIZE ${tmp}*1024) # Convert to bytes (assuming that the value is given in kibibytes) - - endif (${BLAZE_CACHE_SIZE_AUTO}) diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake index 8ef5792fd1..8a79545628 100644 --- a/ports/blaze/portfile.cmake +++ b/ports/blaze/portfile.cmake @@ -1,25 +1,22 @@ vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO blaze-lib/blaze - REF 0380370f0626de2ad0ec7ea815803e22bbf6b42e - SHA512 47df2a291febf0565787ed9c4222ee1958d03c5b76c54923e4d8e44f75321c266e81d69ba4512a4ab07d7e431c065d025e01269cf9c1d5f0927f133885def4c7 + REF v3.8.1 + SHA512 6dfd3cb46d796b94cc44a30c4cd5ebfb366d2eb312d75a28787cacb4636df52e4e4e3dce3d9501bf2c07e7fd3621e8ce7f9ffa61a950a4146375b12d75d4872b HEAD_REF master - PATCHES - fix-vm-build.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBLAZE_SMP_THREADS=OpenMP ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/blaze/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/blaze/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/blaze/vcpkg.json b/ports/blaze/vcpkg.json index 19a46638cb..116078565d 100644 --- a/ports/blaze/vcpkg.json +++ b/ports/blaze/vcpkg.json @@ -1,11 +1,19 @@ { "name": "blaze", - "version-string": "3.8", - "port-version": 2, + "version": "3.8.1", "description": "Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.", "homepage": "https://bitbucket.org/blaze-lib/blaze", + "license": "BSD-3-Clause", "dependencies": [ "boost-exception", - "lapack" + "lapack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/b-/blaze.json b/versions/b-/blaze.json index 3a4a1c091d..2a94caab10 100644 --- a/versions/b-/blaze.json +++ b/versions/b-/blaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6bea7e024ba776f0a7c5462056054529f79aa86d", + "version": "3.8.1", + "port-version": 0 + }, { "git-tree": "8795a94d25adbb75d3be0b191bc3c15321e9c686", "version-string": "3.8", diff --git a/versions/baseline.json b/versions/baseline.json index 1f6882a1da..ac63e966d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -497,8 +497,8 @@ "port-version": 1 }, "blaze": { - "baseline": "3.8", - "port-version": 2 + "baseline": "3.8.1", + "port-version": 0 }, "blend2d": { "baseline": "2022-05-02",