From ee822c1fbde6ff830aaf99189fb0dcf336af06a1 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 7 Oct 2017 23:27:57 -0400 Subject: [PATCH] Remove crazy from korlib PythonInterp selection --- korlib/CMakeLists.txt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/korlib/CMakeLists.txt b/korlib/CMakeLists.txt index dce5c59..ce3e66f 100644 --- a/korlib/CMakeLists.txt +++ b/korlib/CMakeLists.txt @@ -5,15 +5,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") # Stolen shamelessly from PyHSPlasma find_package(PythonLibs 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 -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(PythonInterp "3.5" REQUIRED) find_package(HSPlasma REQUIRED) find_package(Ogg REQUIRED) find_package(OpenGL REQUIRED)