<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a0f57d8e19baf1de94f7d6b47621ca320c91ac8e">https://github.com/macports/macports-ports/commit/a0f57d8e19baf1de94f7d6b47621ca320c91ac8e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a0f57d8e19baf1de94f7d6b47621ca320c91ac8e
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Oct 22 20:43:27 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> linear_algebra PG: add support for CMake builds
</span>---
_resources/port1.0/group/linear_algebra-1.0.tcl | 15 +++++++++++++++
1 file changed, 15 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/linear_algebra-1.0.tcl b/_resources/port1.0/group/linear_algebra-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a47cf9..d548d01 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/linear_algebra-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/linear_algebra-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +14,9 @@
</span> #
# in pre-configure, a line like this may be needed:
# configure.args-append --with-blas="-L${prefix}/lib ${linalglib}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-append ${cmake_linalglib} (for CMake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span> #
# If +threads and +atlas are set, the threaded ATLAS library will be used.
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,10 +26,12 @@
</span> PortGroup active_variants 1.1
options linalglib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_linalglib \
</span> blas_only \
veclibfort
default linalglib ""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake_linalglib ""
</span> default blas_only no
default veclibfort yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,8 +59,11 @@ variant accelerate conflicts atlas openblas description {Build with linear algeb
</span> if {$veclibfort} {
depends_lib-append port:vecLibFort
linalglib -lvecLibFort
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_linalglib -DBLAS_LIBRARIES=vecLibFort \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_LIBRARIES=vecLibFort
</span> } else {
linalglib -framework Accelerate
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_linalglib -DBLA_VENDOR=Apple
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,9 +71,15 @@ variant atlas conflicts accelerate openblas description {Build with linear algeb
</span> depends_lib-append port:atlas
if {[variant_isset threads]} {
linalglib -ltatlas
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_linalglib -DBLAS_LIBRARIES=tatlas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_LIBRARIES=tatlas
</span> } else {
linalglib -lsatlas
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_linalglib -DBLAS_LIBRARIES=satlas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_LIBRARIES=satlas
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FindBLAS.cmake and FindLAPACK.cmake do not find MacPorts Atlas properly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure.args-append -DBLA_VENDOR=ATLAS
</span> }
variant openblas conflicts accelerate atlas description {Build with linear algebra from OpenBLAS} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,6 +89,7 @@ variant openblas conflicts accelerate atlas description {Build with linear algeb
</span> require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
}
linalglib -lopenblas
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_linalglib -DBLA_VENDOR=OpenBLAS
</span> }
if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
</pre><pre style='margin:0'>
</pre>