[flann/el5] Don't install setup.py by default
rmattes
rmattes at fedoraproject.org
Tue Dec 20 01:38:28 UTC 2011
commit a2ea818965de4ce9277781668f45513d82fe7cc8
Author: Rich Mattes <richmattes at gmail.com>
Date: Mon Dec 19 20:36:43 2011 -0500
Don't install setup.py by default
flann-1.6.11.fixpyflann.patch | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/flann-1.6.11.fixpyflann.patch b/flann-1.6.11.fixpyflann.patch
index 0155c6e..c892b8d 100644
--- a/flann-1.6.11.fixpyflann.patch
+++ b/flann-1.6.11.fixpyflann.patch
@@ -1,18 +1,12 @@
diff -up ./src/python/CMakeLists.txt.fixpyflann ./src/python/CMakeLists.txt
---- ./src/python/CMakeLists.txt.fixpyflann 2011-12-18 22:16:26.403844146 -0500
-+++ ./src/python/CMakeLists.txt 2011-12-19 19:01:18.214736835 -0500
-@@ -5,8 +5,8 @@ install( FILES ${CMAKE_CURRENT_BINARY_DI
+--- ./src/python/CMakeLists.txt.fixpyflann 2011-12-19 20:36:02.328037210 -0500
++++ ./src/python/CMakeLists.txt 2011-12-19 20:36:07.684230846 -0500
+@@ -1,7 +1,7 @@
+ 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 )
++#install( FILES ${CMAKE_CURRENT_BINARY_DIR}/setup.py DESTINATION share/flann/python )
# 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()
-diff -up ./src/python/setup.py.tpl.fixpyflann ./src/python/setup.py.tpl
More information about the scm-commits
mailing list