[flann/el6: 6/6] Really fix patch this time
rmattes
rmattes at fedoraproject.org
Tue Dec 20 02:12:13 UTC 2011
commit c6cb958f40a39b459bbe776fa793358aebf95400
Author: Rich Mattes <richmattes at gmail.com>
Date: Mon Dec 19 20:48:48 2011 -0500
Really fix patch this time
flann-1.6.11.fixpyflann.patch | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/flann-1.6.11.fixpyflann.patch b/flann-1.6.11.fixpyflann.patch
index 06f9a97..57a4891 100644
--- a/flann-1.6.11.fixpyflann.patch
+++ b/flann-1.6.11.fixpyflann.patch
@@ -1,7 +1,7 @@
diff -up ./src/python/CMakeLists.txt.fixpyflann ./src/python/CMakeLists.txt
---- ./src/python/CMakeLists.txt.fixpyflann 2011-12-19 20:36:02.328037210 -0500
-+++ ./src/python/CMakeLists.txt 2011-12-19 20:37:55.807140443 -0500
-@@ -1,7 +1,7 @@
+--- ./src/python/CMakeLists.txt.fixpyflann 2011-12-19 20:47:59.861982251 -0500
++++ ./src/python/CMakeLists.txt 2011-12-19 20:48:10.091352132 -0500
+@@ -1,12 +1,12 @@
configure_file( setup.py.tpl setup.py )
install( DIRECTORY pyflann DESTINATION share/flann/python )
@@ -10,3 +10,13 @@ diff -up ./src/python/CMakeLists.txt.fixpyflann ./src/python/CMakeLists.txt
# python instalation
+-if (PYTHON_EXECUTABLE)
+- install(CODE "execute_process(
+- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install
+- WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")")
+-endif()
++#if (PYTHON_EXECUTABLE)
++# install(CODE "execute_process(
++# COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install
++# WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")")
++#endif()
More information about the scm-commits
mailing list