diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-09-04 18:59:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 18:59:21 -0700 |
| commit | bb61fc16628994678ee3855008972a28797ba5a7 (patch) | |
| tree | 419d508bdf29a0edd04976e9ece7f8aa43e332b8 /ports/blaze | |
| parent | c41328a87c1436820f9e3dd2c970d407de52eaf7 (diff) | |
| download | vcpkg-bb61fc16628994678ee3855008972a28797ba5a7.tar.gz vcpkg-bb61fc16628994678ee3855008972a28797ba5a7.zip | |
[blaze][ceres][clapack][geogram][lapack][lapack-reference][opencv4][selene] Fix deps issues (#13229)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/blaze')
| -rw-r--r-- | ports/blaze/CONTROL | 1 | ||||
| -rw-r--r-- | ports/blaze/fix-vm-build.patch | 20 | ||||
| -rw-r--r-- | ports/blaze/portfile.cmake | 2 |
3 files changed, 23 insertions, 0 deletions
diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL index 49343784c..94d148368 100644 --- a/ports/blaze/CONTROL +++ b/ports/blaze/CONTROL @@ -1,5 +1,6 @@ Source: blaze Version: 3.8 +Port-Version: 1 Build-Depends: lapack, boost-exception Homepage: https://bitbucket.org/blaze-lib/blaze Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic. diff --git a/ports/blaze/fix-vm-build.patch b/ports/blaze/fix-vm-build.patch new file mode 100644 index 000000000..3936299e0 --- /dev/null +++ b/ports/blaze/fix-vm-build.patch @@ -0,0 +1,20 @@ +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 012889f22..8ef5792fd 100644 --- a/ports/blaze/portfile.cmake +++ b/ports/blaze/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_bitbucket( REF 0380370f0626de2ad0ec7ea815803e22bbf6b42e SHA512 47df2a291febf0565787ed9c4222ee1958d03c5b76c54923e4d8e44f75321c266e81d69ba4512a4ab07d7e431c065d025e01269cf9c1d5f0927f133885def4c7 HEAD_REF master + PATCHES + fix-vm-build.patch ) vcpkg_configure_cmake( |