CMake: fix python version

Clement Champetier · Clement Champetier · commit 2b35f8699aac · 2014-09-15T11:55:20.000+02:00
* Never get python version from DEFINED PYTHONLIBS_VERSION_STRING, even
if CMake 2.8.8.
* Get python version from include path.
* This will fix the python stuff when create packages.
* Use PYTHON_INCLUDE_DIR instead of PYTHON_INCLUDE_DIRS (not defined in all CMake versions...).
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -61,12 +61,10 @@ if(SWIG_FOUND)
 	if(PYTHONLIBS_FOUND)
 		include_directories(${PYTHON_INCLUDE_PATH})
 
-		if(NOT DEFINED PYTHONLIBS_VERSION_STRING) # Since CMake 2.8.8
-			# Get Python version from include path
-			string(LENGTH ${PYTHON_INCLUDE_DIRS} PYTHON_INCLUDE_DIRS_LENGTH)
-			math(EXPR PYTHON_INCLUDE_DIRS_LENGTH "${PYTHON_INCLUDE_DIRS_LENGTH} - 3" )
-			string(SUBSTRING ${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS_LENGTH} 3 PYTHONLIBS_VERSION_STRING)
-		endif()
+		# Get Python version from include path
+		string(LENGTH ${PYTHON_INCLUDE_DIR} PYTHON_INCLUDE_DIRS_LENGTH)
+		math(EXPR PYTHON_INCLUDE_DIRS_LENGTH "${PYTHON_INCLUDE_DIRS_LENGTH} - 3" )
+		string(SUBSTRING ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS_LENGTH} 3 PYTHONLIBS_VERSION_STRING)
 
 		# Swig flags
 		set(CMAKE_SWIG_FLAGS -c++ -fcompact)
