[127975] trunk/dports/math/viennacl

stromnov at macports.org stromnov at macports.org
Sun Nov 9 13:19:21 PST 2014


Revision: 127975
          https://trac.macports.org/changeset/127975
Author:   stromnov at macports.org
Date:     2014-11-09 13:19:21 -0800 (Sun, 09 Nov 2014)
Log Message:
-----------
viennacl: update to version 1.6.0

Modified Paths:
--------------
    trunk/dports/math/viennacl/Portfile
    trunk/dports/math/viennacl/files/patch-CMakeLists.txt.diff

Added Paths:
-----------
    trunk/dports/math/viennacl/files/patch-cmake_ViennaCLCommon.cmake.diff
    trunk/dports/math/viennacl/files/patch-libviennacl_CMakeLists.txt.diff

Modified: trunk/dports/math/viennacl/Portfile
===================================================================
--- trunk/dports/math/viennacl/Portfile	2014-11-09 21:17:55 UTC (rev 127974)
+++ trunk/dports/math/viennacl/Portfile	2014-11-09 21:19:21 UTC (rev 127975)
@@ -1,11 +1,11 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim: fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem          1.0
 PortGroup           cmake 1.0
 
 name                viennacl
-version             1.5.2
+version             1.6.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 revision            0
 categories          math devel
@@ -26,8 +26,8 @@
 homepage            http://viennacl.sourceforge.net
 master_sites        sourceforge:project/viennacl/${branch}.x
 
-checksums           rmd160  fdbc5b9bfb6e387fa94b2d33862f9a7458ef8cf1 \
-                    sha256  e443c7b589d083ccb64064feaac37fa663ef1a12aad10b305e047ec16c4002ba
+checksums           rmd160  e27f58d80f54b9ecc144d8782e047e12da3075d8 \
+                    sha256  983071127ee36ae9bf2dae385bec0c9bd8cfe34ce37e64ab77c95391e8d038ab
 
 distname            ViennaCL-${version}
 
@@ -38,10 +38,13 @@
     file mkdir ${worksrcpath}
 }
 
-patchfiles-append   patch-CMakeLists.txt.diff
+patchfiles-append   patch-CMakeLists.txt.diff \
+                    patch-cmake_ViennaCLCommon.cmake.diff \
+                    patch-libviennacl_CMakeLists.txt.diff
 
 post-patch {
-    reinplace "s|@@PREFIX@@|${prefix}|" "${workpath}/${distname}/CMakeLists.txt"
+    reinplace "s|@prefix@|${prefix}|" "${patch.dir}/CMakeLists.txt"
+    reinplace "s|@prefix@|${prefix}|" "${patch.dir}/cmake/ViennaCLCommon.cmake"
 }
 
 depends_lib-append  port:boost

Modified: trunk/dports/math/viennacl/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/math/viennacl/files/patch-CMakeLists.txt.diff	2014-11-09 21:17:55 UTC (rev 127974)
+++ trunk/dports/math/viennacl/files/patch-CMakeLists.txt.diff	2014-11-09 21:19:21 UTC (rev 127975)
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2013-12-26 13:58:47.000000000 +0400
-+++ CMakeLists.txt	2013-12-26 13:59:29.000000000 +0400
-@@ -36,7 +36,7 @@
- # For out-of-the-box support on MacOS:
- IF (ENABLE_OPENCL)
-   IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--    INCLUDE_DIRECTORIES("/opt/local/include")
-+    INCLUDE_DIRECTORIES("@@PREFIX@@/include")
-     set(CMAKE_EXE_LINKER_FLAGS "-framework OpenCL")
-   ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- ENDIF(ENABLE_OPENCL)
+--- CMakeLists.txt.orig	2014-11-09 20:47:39.000000000 +0300
++++ CMakeLists.txt	2014-11-09 20:48:54.000000000 +0300
+@@ -15,7 +15,7 @@
+ 
+ # Set boost path here if not found automatically by CMake
+ #SET(BOOST_ROOT "C:/Program\ Files\ (x86)/boost/boost_1_42")     # adjust this on Windows
+-#SET(BOOST_ROOT "/opt/local/include")                            # adjust this on MacOS or Linux
++SET(BOOST_ROOT "@prefix@/include")                            # adjust this on MacOS or Linux
+ 
+ 
+ # Common options - There is usually no need to change anything below this line

Added: trunk/dports/math/viennacl/files/patch-cmake_ViennaCLCommon.cmake.diff
===================================================================
--- trunk/dports/math/viennacl/files/patch-cmake_ViennaCLCommon.cmake.diff	                        (rev 0)
+++ trunk/dports/math/viennacl/files/patch-cmake_ViennaCLCommon.cmake.diff	2014-11-09 21:19:21 UTC (rev 127975)
@@ -0,0 +1,10 @@
+--- cmake/ViennaCLCommon.cmake.orig	2014-11-09 20:50:31.000000000 +0300
++++ cmake/ViennaCLCommon.cmake	2014-11-09 20:51:35.000000000 +0300
+@@ -179,6 +179,6 @@
+       # see https://github.com/viennacl/viennacl-dev/issues/106 for discussion
+     ENDIF()
+   ENDIF()
+-  INCLUDE_DIRECTORIES("/opt/local/include")
++  INCLUDE_DIRECTORIES("@prefix@/include")
+   SET(CMAKE_EXE_LINKER_FLAGS "-framework OpenCL")
+ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

Added: trunk/dports/math/viennacl/files/patch-libviennacl_CMakeLists.txt.diff
===================================================================
--- trunk/dports/math/viennacl/files/patch-libviennacl_CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/math/viennacl/files/patch-libviennacl_CMakeLists.txt.diff	2014-11-09 21:19:21 UTC (rev 127975)
@@ -0,0 +1,11 @@
+--- libviennacl/CMakeLists.txt.orig	2014-11-09 21:40:50.000000000 +0300
++++ libviennacl/CMakeLists.txt	2014-11-09 23:40:34.000000000 +0300
+@@ -38,3 +38,8 @@
+ if(ENABLE_OPENMP AND MINGW)
+    target_link_libraries(viennacl gomp)
+ endif(ENABLE_OPENMP AND MINGW)
++
++install(TARGETS viennacl LIBRARY DESTINATION lib)
++install(DIRECTORY include/
++   DESTINATION "${INSTALL_INCLUDE_DIR}"
++   FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141109/2b6a9d78/attachment.html>


More information about the macports-changes mailing list