From b1dc8a7dfe66699b90f71e064710e4c71006f2b2 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Mon, 13 Feb 2017 21:45:31 -0800 Subject: [PATCH] Fix for compiling with Python 3.6 Ported from libHSPlasma --- korlib/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/korlib/CMakeLists.txt b/korlib/CMakeLists.txt index 6cbcc30..0b05775 100644 --- a/korlib/CMakeLists.txt +++ b/korlib/CMakeLists.txt @@ -5,10 +5,13 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") # Stolen shamelessly from PyHSPlasma find_package(PythonLibs REQUIRED) -find_package(PythonInterp "${PYTHONLIBS_VERSION_STRING}" REQUIRED) +# Use only the major.minor version -- no patch, no +, etc +STRING(REGEX REPLACE "([0-9]\\.[0-9])[0-9.+]*" "\\1" PYTHONLIBS_VERSION_STRING_FILTERED "${PYTHONLIBS_VERSION_STRING}") +find_package(PythonInterp "${PYTHONLIBS_VERSION_STRING_FILTERED}" REQUIRED) # make sure the versions match -if (NOT "${PYTHONLIBS_VERSION_STRING}" STREQUAL "${PYTHON_VERSION_STRING}") - message(FATAL_ERROR "Versions of Python libraries (${PYTHONLIBS_VERSION_STRING}) and Python interpreter (${PYTHON_VERSION_STRING}) do not match. Please configure the paths manually.") +STRING(REGEX REPLACE "([0-9]\\.[0-9])[0-9.+]*" "\\1" PYTHON_VERSION_STRING_FILTERED "${PYTHON_VERSION_STRING}") +if (NOT "${PYTHONLIBS_VERSION_STRING_FILTERED}" STREQUAL "${PYTHON_VERSION_STRING_FILTERED}") + message(FATAL_ERROR "Versions of Python libraries (${PYTHONLIBS_VERSION_STRING_FILTERED}) and Python interpreter (${PYTHON_VERSION_STRING_FILTERED}) do not match. Please configure the paths manually.") endif() find_package(HSPlasma REQUIRED)