summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGard Spreemann <gspr@nonempty.org>2019-10-22 15:18:16 +0200
committerGard Spreemann <gspr@nonempty.org>2019-10-22 15:18:16 +0200
commit073b532612e4cc26513d265eddbd3eec11f3df98 (patch)
treec2c4722201b06e6d877f1a15759aa767fac7e26f
parent811b90d7e04c07ec0a31d3068d380324908e8665 (diff)
Patch to install Python modules in correct location.
-rw-r--r--debian/patches/0008-Install-Python-module-in-correct-location.patch21
-rw-r--r--debian/patches/series1
2 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/0008-Install-Python-module-in-correct-location.patch b/debian/patches/0008-Install-Python-module-in-correct-location.patch
new file mode 100644
index 00000000..ef99842a
--- /dev/null
+++ b/debian/patches/0008-Install-Python-module-in-correct-location.patch
@@ -0,0 +1,21 @@
+From: Gard Spreemann <gspr@nonempty.org>
+Date: Thu, 26 Sep 2019 13:26:22 +0200
+Subject: Install Python module in correct location.
+
+---
+ src/python/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
+index 4c6840f..9954ac5 100644
+--- a/src/python/CMakeLists.txt
++++ b/src/python/CMakeLists.txt
+@@ -208,7 +208,7 @@ if(PYTHONINTERP_FOUND)
+ add_custom_target(python ALL DEPENDS gudhi.so
+ COMMENT "Do not forget to add ${CMAKE_CURRENT_BINARY_DIR}/ to your PYTHONPATH before using examples or tests")
+
+- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install)")
++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py install --root=${CMAKE_SOURCE_DIR}/debian/tmp --single-version-externally-managed --install-layout=deb WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
+
+ # Test examples
+ if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
diff --git a/debian/patches/series b/debian/patches/series
index f9b4f236..fbaa9d8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0005-Force-linking-against-libatomic-for-parts-that-use-T.patch
0006-Offline-header-for-docs.patch
0007-Disable-Sphinx.patch
+0008-Install-Python-module-in-correct-location.patch