summaryrefslogtreecommitdiffstats
path: root/espresso/1042.patch
diff options
context:
space:
mode:
Diffstat (limited to 'espresso/1042.patch')
-rw-r--r--espresso/1042.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/espresso/1042.patch b/espresso/1042.patch
new file mode 100644
index 0000000..ea0c067
--- /dev/null
+++ b/espresso/1042.patch
@@ -0,0 +1,26 @@
+From cf4a369485736b7a901fa02bbc911f8d5dddab6a Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@votca.org>
+Date: Tue, 21 Feb 2017 17:56:55 -0700
+Subject: [PATCH] cmake: allow user to override PYTHON_INSTDIR
+
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c6ba209..88de171 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -115,9 +115,11 @@ if (WITH_PYTHON)
+ -c "import distutils.sysconfig as cg; print(cg.get_python_inc())"
+ OUTPUT_VARIABLE PYTHON_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
+ find_package(NumPy REQUIRED)
+- execute_process(COMMAND ${PYTHON_EXECUTABLE}
++ if(NOT PYTHON_INSTDIR)
++ execute_process(COMMAND ${PYTHON_EXECUTABLE}
+ -c "import distutils.sysconfig as cg; print(cg.get_python_lib(1,0,prefix='${CMAKE_INSTALL_EXEC_PREFIX}'))"
+ OUTPUT_VARIABLE PYTHON_INSTDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
++ endif(NOT PYTHON_INSTDIR)
+ if(PYTHON_VERSION_MAJOR EQUAL 2)
+ set(CYTHON_FLAGS "-2" CACHE STRING "Flags used by the Cython compiler during all build types.")
+ else()