Merge branch 'master' into release

CMakeLists.txt

@@ -53,13 +53,13 @@ set(EMBEDDED_PYTHON FALSE)
 if(ENABLE_PYTHON_EMBEDDING)
    # 1. a Python interpreter of the suitable version exists
    if("${PYTHON_INTERPRETER}" STREQUAL "")
-      find_package(PythonInterp 2.6 REQUIRED)
+      find_package(PythonInterp 2.4 REQUIRED)
    else()
       set(PYTHONINTERP_FOUND TRUE)
       set(PYTHON_EXECUTABLE "${PYTHON_INTERPRETER}")
       get_Python_version_string(pyVersion)
       set(PYTHON_VERSION_STRING "${pyVersion}")
-      message(STATUS "Passed PythonInterp: ${PYTHON_INTERPRETER} (found suitable version \"${PYTHON_VERSION_STRING}\", minimum required is \"2.6\")")
+      message(STATUS "Passed PythonInterp: ${PYTHON_INTERPRETER} (found suitable version \"${PYTHON_VERSION_STRING}\", minimum required is \"2.4\")")
    endif()	
    # 2. Python libraries and headers of the same version exist
    # Set variables to help find Python library that is compatible with interpreter
@@ -116,6 +116,8 @@ if(ENABLE_PYTHON_EMBEDDING)
       message(STATUS "   Dependencies not satisfied")
    endif()
 else()
+   # The Python interpreter is anyway needed to run the MergeStaticLibs.py script
+   find_package(PythonInterp 2.4 REQUIRED)
    message(STATUS "Python embedding DISABLED")
 endif()
 find_package(ZLIB REQUIRED)