[93973] trunk/dports/science/flann

[mmoll at macports.org]

Revision: 93973
          https://trac.macports.org/changeset/93973
Author:   mmoll at macports.org
Date:     2012-06-05 20:25:12 -0700 (Tue, 05 Jun 2012)
Log Message:
-----------
science/flann: don't install python module in /share, work around cmake bug. possible fix for #32940

Modified Paths:
--------------
    trunk/dports/science/flann/Portfile
    trunk/dports/science/flann/files/patch-src-python-CMakeLists.txt.diff

Added Paths:
-----------
    trunk/dports/science/flann/files/patch-src-cpp-CMakeLists.txt.diff

Modified: trunk/dports/science/flann/Portfile
===================================================================
--- trunk/dports/science/flann/Portfile	2012-06-05 20:52:50 UTC (rev 93972)
+++ trunk/dports/science/flann/Portfile	2012-06-06 03:25:12 UTC (rev 93973)
@@ -4,7 +4,7 @@
 PortGroup cmake 1.0
 name                flann
 version             1.7.1
-revision            2
+revision            3
 categories          science devel
 maintainers         mmoll
 description         Fast Library for Approximate Nearest Neighbors
@@ -25,7 +25,7 @@
                     sha1    4f3cef9b4f171b1ee4a98f4f684c350c3022e9b2 \
                     rmd160  c48f6de9d3c1c87a446a4f3f0353ff02f4fe6506
 depends_lib         port:hdf5-18 port:tbb
-patchfiles          patch-src-python-CMakeLists.txt.diff
+patchfiles          patch-src-cpp-CMakeLists.txt.diff patch-src-python-CMakeLists.txt.diff
 patch.dir           ${worksrcpath}/${worksrcdir}
 
 # MPI support is automatically disabled if hdf5-18 is installed without the +openmpi variant

Added: trunk/dports/science/flann/files/patch-src-cpp-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/flann/files/patch-src-cpp-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/science/flann/files/patch-src-cpp-CMakeLists.txt.diff	2012-06-06 03:25:12 UTC (rev 93973)
@@ -0,0 +1,14 @@
+--- src/cpp/CMakeLists.txt.orig	2012-06-05 22:10:49.000000000 -0500
++++ src/cpp/CMakeLists.txt	2012-06-05 22:13:11.000000000 -0500
+@@ -159,8 +159,10 @@
+     )
+ endif()
+ 
++# work around cmake bug http://public.kitware.com/Bug/view.php?id=10366
+ install (
+     DIRECTORY flann
+     DESTINATION include
+-    FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
++    PATTERN "*.cpp" EXCLUDE
++    PATTERN "*.cu" EXCLUDE
+ )

Modified: trunk/dports/science/flann/files/patch-src-python-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/flann/files/patch-src-python-CMakeLists.txt.diff	2012-06-05 20:52:50 UTC (rev 93972)
+++ trunk/dports/science/flann/files/patch-src-python-CMakeLists.txt.diff	2012-06-06 03:25:12 UTC (rev 93973)
@@ -1,6 +1,12 @@
---- src/python/CMakeLists.txt.orig	2012-02-21 18:35:22.000000000 -0600
-+++ src/python/CMakeLists.txt	2012-02-21 18:37:32.000000000 -0600
-@@ -7,6 +7,6 @@
+--- src/python/CMakeLists.txt.orig	2012-06-05 21:44:17.000000000 -0500
++++ src/python/CMakeLists.txt	2012-06-05 21:47:06.000000000 -0500
+@@ -1,12 +1,8 @@
+ configure_file( setup.py.tpl setup.py )
+ 
+-install( DIRECTORY pyflann DESTINATION share/flann/python )
+-install( FILES ${CMAKE_CURRENT_BINARY_DIR}/setup.py DESTINATION share/flann/python )
+-
+-
  # python instalation
  if (PYTHON_EXECUTABLE)
      install(CODE "execute_process(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120605/f2d4ce53/attachment.html>