Fixes for PyPy support

Author: isuruf

cmake/FindCython.cmake

@@ -4,7 +4,8 @@
 
 # This finds the "cython" executable in your PATH, and then in some standard
 # paths:
-SET(CYTHON_BIN cython CACHE STRING "Cython executable name")
+
+find_program(CYTHON_BIN NAMES cython cython3 cython2)
 SET(CYTHON_FLAGS --cplus --fast-fail)
 
 SET(Cython_FOUND FALSE)
@@ -27,21 +28,22 @@ ENDIF (CYTHON_BIN)
 
 
 IF (Cython_FOUND)
-	IF (NOT Cython_FIND_QUIETLY)
-		MESSAGE(STATUS "Found CYTHON: ${CYTHON_BIN}")
-	ENDIF (NOT Cython_FIND_QUIETLY)
+    IF (NOT Cython_FIND_QUIETLY)
+        MESSAGE(STATUS "Found CYTHON: ${CYTHON_BIN}")
+    ENDIF (NOT Cython_FIND_QUIETLY)
 ELSE (Cython_FOUND)
-	IF (Cython_FIND_REQUIRED)
+    IF (Cython_FIND_REQUIRED)
         if(Cython_Compilation_Failed)
             MESSAGE(STATUS "Found CYTHON: ${CYTHON_BIN}")
-			# On Win the testing of Cython does not return any accessible value, so the test is not carried out. Fresh Cython install was tested and works.
-			IF(NOT MSVC)
-				MESSAGE(FATAL_ERROR "Your Cython version is too old. Please upgrade Cython.")
-			ENDIF(NOT MSVC)
+            # On Win the testing of Cython does not return any accessible value, so the test is not carried out.
+            # Fresh Cython install was tested and works.
+            IF(NOT MSVC)
+                MESSAGE(FATAL_ERROR "Your Cython version is too old. Please upgrade Cython.")
+            ENDIF(NOT MSVC)
         else(Cython_Compilation_Failed)
             MESSAGE(FATAL_ERROR "Could not find Cython. Please install Cython.")
         endif(Cython_Compilation_Failed)
-	ENDIF (Cython_FIND_REQUIRED)
+    ENDIF (Cython_FIND_REQUIRED)
 ENDIF (Cython_FOUND)
 
 

cmake/FindPython.cmake

@@ -56,18 +56,12 @@ set(PYTHON_INSTALL_PATH ${PYTHON_INSTALL_PATH_tmp}
     CACHE BOOL "Python install path")
 message(STATUS "Python install path: ${PYTHON_INSTALL_PATH}")
 
-if (NOT WIN32)
-    execute_process(
-        COMMAND ${PYTHON_BIN} -c "from distutils.sysconfig import get_config_var; print(get_config_var('SOABI'))"
-        OUTPUT_VARIABLE PYTHON_EXTENSION_SOABI_tmp
-        )
-    string(STRIP ${PYTHON_EXTENSION_SOABI_tmp} PYTHON_EXTENSION_SOABI_tmp)
-    if (NOT "${PYTHON_EXTENSION_SOABI_tmp}" STREQUAL "None")
-        set(PYTHON_EXTENSION_SOABI_tmp ".${PYTHON_EXTENSION_SOABI_tmp}")
-    else()
-        set(PYTHON_EXTENSION_SOABI_tmp "")
-    endif()
-endif()
+execute_process(
+    COMMAND ${PYTHON_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_suffix.py
+    OUTPUT_VARIABLE PYTHON_EXTENSION_SOABI_tmp
+)
+string(STRIP ${PYTHON_EXTENSION_SOABI_tmp} PYTHON_EXTENSION_SOABI_tmp)
+
 set(PYTHON_EXTENSION_SOABI ${PYTHON_EXTENSION_SOABI_tmp}
     CACHE STRING "Suffix for python extensions")
 

cmake/get_suffix.py

@@ -0,0 +1,7 @@
+from __future__ import print_function
+from distutils.sysconfig import get_config_var
+extsuffix = get_config_var('EXT_SUFFIX')
+if extsuffix is None:
+    print("")
+else:
+    print(extsuffix[0:].rsplit(".", 1)[0])