From 69c025eb4b42d203b0e6859d5c350cead91d4208 Mon Sep 17 00:00:00 2001 From: David Wagner Date: Tue, 14 Apr 2015 18:13:11 +0200 Subject: python: prefer 2.7.x and make sure interpreter and libs are aligned CMake's find_package command makes it possible to specify a version. Take advantage of that to favor the interpreter's version to 2.7 and then pin the library's version to the very same version as the interpreter. This does not ensure that 2.7.x is used (e.g. if 2.7.x is not present, another version will be used) but it helps a lot. Signed-off-by: David Wagner --- bindings/python/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bindings') diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index f3fc388..a885feb 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -29,7 +29,11 @@ find_package(SWIG REQUIRED) include(${SWIG_USE_FILE}) -find_package(PythonLibs REQUIRED) +# Force usage of Python 2.7.x ... +find_package(PythonInterp 2.7 REQUIRED) + +# ... and force the libs to be at the same version as the interpreter +find_package(PythonLibs ${PYTHON_VERSION_STRING} EXACT REQUIRED) include_directories(${PYTHON_INCLUDE_DIRS}) include_directories(${PROJECT_SOURCE_DIR}/parameter/include) @@ -63,7 +67,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable -DSWIG_PYTH # plat_specific is needed because we are installing a shared-library python # module and not only a pure python module. # prefix='' makes get_python_lib return a relative path. -find_package(PythonInterp) execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig;\\ -- cgit v1.1