diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 03215e60..b87d7edc 100644 --- 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) @@ -80,7 +78,7 @@ if(SWIG_FOUND) swig_link_libraries(avtranscoder-py avtranscoder-shared ${PYTHON_LIBRARIES}) # Install python interface - file(GLOB AVTRANSCODER_PYTHON_BINDING_FILE "${CMAKE_SWIG_OUTDIR}/*.py") + set(AVTRANSCODER_PYTHON_BINDING_FILE "${CMAKE_SWIG_OUTDIR}/AvTranscoder.py") install( FILES ${AVTRANSCODER_PYTHON_BINDING_FILE} RENAME "avtranscoder.py"