new. version 0.8
[packages/qpid-proton.git] / 0001-PROTON-731-Installing-Python-requires-Proton-be-inst.patch
CommitLineData
6d1b46c8
ER
1From a0670dd53c9d3b444656917e0b663364f6f20aa5 Mon Sep 17 00:00:00 2001
2From: "Darryl L. Pierce" <mcpierce@gmail.com>
3Date: Mon, 27 Oct 2014 15:01:52 -0400
4Subject: [PATCH] PROTON-731: Installing Python requires Proton be installed
5 already.
6
7The CHECK_SYSINSTALL_PYTHON variable was not being set, so it's now
8being set by default but can be overridden from the command line.
9
10Also changed the PYTHON_SITEARCH_PACKAGES variable a cache done that can
11also be overridden from the command line as well.
12---
13 proton-c/bindings/python/CMakeLists.txt | 4 +++-
14 1 file changed, 3 insertions(+), 1 deletion(-)
15
16diff --git a/proton-c/bindings/python/CMakeLists.txt b/proton-c/bindings/python/CMakeLists.txt
17index b8cdb57..ff8c706 100644
18--- a/proton-c/bindings/python/CMakeLists.txt
19+++ b/proton-c/bindings/python/CMakeLists.txt
20@@ -22,6 +22,8 @@
21
22 set(CMAKE_SWIG_FLAGS "-threads")
23
24+set(CHECK_SYSINSTALL_PYTHON ON CACHE INTERNAL "")
25+
26 include_directories (${PYTHON_INCLUDE_PATH})
27 if (BUILD_WITH_CXX)
28 SET_SOURCE_FILES_PROPERTIES(cproton.i PROPERTIES CPLUSPLUS ON)
29@@ -74,7 +76,7 @@ if (CHECK_SYSINSTALL_PYTHON)
30
31 else ()
32 # install the bindings using the CMAKE path variables:
33- set (PYTHON_SITEARCH_PACKAGES ${BINDINGS_DIR}/python)
34+ set (PYTHON_SITEARCH_PACKAGES ${BINDINGS_DIR}/python CACHE INTERNAL "")
35
36 install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile cproton.py
37 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
38--
391.9.3
40
This page took 0.048182 seconds and 4 git commands to generate.