Skip to content

Commit

Permalink
CMake: update path to install python bindings
Browse files Browse the repository at this point in the history
Python libs should be installed in "lib/python2.7" instead of
"lib/python2.7.x".
  • Loading branch information
Clement Champetier committed Jul 29, 2015
1 parent 2ca246a commit 3e8aebb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,15 @@ if(SWIG_FOUND)

# Install python interface
set(AVTRANSCODER_PYTHON_BINDING_FILE "${CMAKE_SWIG_OUTDIR}/avtranscoder.py")
set(AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR "lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/")
string(SUBSTRING ${PYTHONLIBS_VERSION_STRING} 0 3 PYTHON_VERSION)
set(AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR "lib/python${PYTHON_VERSION}/site-packages/pyAvTranscoder/")
install(
FILES ${AVTRANSCODER_PYTHON_BINDING_FILE} ${AVTRANSCODER_PYTHON_INIT_FILE}
DESTINATION ${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}
OPTIONAL
)
# Install python lib and __init__.py files
install(TARGETS ${SWIG_MODULE_avtranscoder-py_REAL_NAME} DESTINATION "lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/" OPTIONAL)
install(TARGETS ${SWIG_MODULE_avtranscoder-py_REAL_NAME} DESTINATION ${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR} OPTIONAL)
install(CODE "file(WRITE ${CMAKE_INSTALL_PREFIX}/${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}/__init__.py)")
else()
message("PYTHON not found, will not build python binding.")
Expand Down
2 changes: 1 addition & 1 deletion tools/travis.python.nosetests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Get avtranscoder library
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${DEPENDENCY_INSTALL}/lib
export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7.6/site-packages/:$PYTHONPATH
export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7/site-packages/:$PYTHONPATH

# Get assets
git clone https://github.com/avTranscoder/avTranscoder-data.git
Expand Down

0 comments on commit 3e8aebb

Please sign in to comment.