From 464910cffa44a97e63b2e4fa084191f16e2de22c Mon Sep 17 00:00:00 2001 From: Simon Pantzare Date: Sat, 21 Mar 2015 13:36:05 +0100 Subject: [PATCH] use same python executable in subprocess --- CMakeLists.txt | 10 ++++++++-- setup.py.cmake | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95c4202..c5be7cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,9 +15,15 @@ add_subdirectory (libjpeg) add_subdirectory (JpegEncoderEXIF) add_subdirectory (bindings) -find_program(PYTHON "python") +option(PY "PY" "") -set(BINDINGS_VERSION "0.1.3") +if( "${PY}" STREQUAL "" ) + find_program(PYTHON "python") +else() + set(PYTHON "${PY}") +endif() + +set(BINDINGS_VERSION "0.1.4") if (PYTHON) set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/bindings.py.cmake") diff --git a/setup.py.cmake b/setup.py.cmake index d9a0963..c309b35 100644 --- a/setup.py.cmake +++ b/setup.py.cmake @@ -23,7 +23,7 @@ class install(_install): def _delegate(): - _run("cmake .") + _run("cmake -DPY='{}' .".format(sys.executable)) _run("make bindings_distutils") sys.stderr.write("delegating to bindings.py... \n") sys.stderr.flush()