From 19b0b0c2f1989136f6c8fd1def9f27214d68ec28 Mon Sep 17 00:00:00 2001 From: Noel Eck Date: Fri, 24 Jun 2016 17:11:28 -0700 Subject: [PATCH] python: Fixes for building python modules Moved src include AFTER setter for PYTHONBUILD_VERSION. In this way, the src CMakeLists has a valid PYTHONBUILD_VERSION str. Call find_package on PythonInterp prior to finding the libs (recommended). Signed-off-by: Noel Eck --- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 283d5a77..95e8c2f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,8 +231,6 @@ if (RPM) include(CPack) endif() -add_subdirectory (src) - if(BUILDEXAMPLES) add_subdirectory (examples/c++) endif() @@ -249,6 +247,8 @@ if (BUILDSWIGPYTHON OR BUILDTESTS) endif () endif () +add_subdirectory (src) + if (BUILDTESTS) find_package (PythonInterp ${PYTHONBUILD_VERSION} REQUIRED) enable_testing () diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 117f25d7..d1a70c52 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -178,7 +178,8 @@ endmacro() if (SWIG_FOUND) if (BUILDSWIGPYTHON) if(NOT PYTHONLIBS_FOUND) - find_package (PythonLibs ${PYTHONBUILD_VERSION} REQUIRED) + find_package (PythonInterp ${PYTHONBUILD_VERSION} EXACT REQUIRED) + find_package (PythonLibs ${PYTHONBUILD_VERSION} EXACT REQUIRED) string (REPLACE "." ";" PYTHON_VERSION_LIST ${PYTHONLIBS_VERSION_STRING}) list (GET PYTHON_VERSION_LIST 0 PYTHON_VERSION_MAJOR) list (GET PYTHON_VERSION_LIST 1 PYTHON_VERSION_MINOR)