Commit3e8aebb

Clement Champetier

committed

CMake: update path to install python bindings

Python libs should be installed in "lib/python2.7" instead of"lib/python2.7.x".

1 parent2ca246a commit3e8aebbCopy full SHA for 3e8aebb

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -106,14 +106,15 @@ if(SWIG_FOUND)`
`106`	`106`
`107`	`107`	`# Install python interface`
`108`	`108`	`set(AVTRANSCODER_PYTHON_BINDING_FILE"${CMAKE_SWIG_OUTDIR}/avtranscoder.py")`
`109`		`-set(AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR"lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/")`
	`109`	`+string(SUBSTRING${PYTHONLIBS_VERSION_STRING}03PYTHON_VERSION)`
	`110`	`+set(AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR"lib/python${PYTHON_VERSION}/site-packages/pyAvTranscoder/")`
`110`	`111`	`install(`
`111`	`112`	`FILES${AVTRANSCODER_PYTHON_BINDING_FILE}${AVTRANSCODER_PYTHON_INIT_FILE}`
`112`	`113`	`DESTINATION${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}`
`113`	`114`	`OPTIONAL`
`114`	`115`	`)`
`115`	`116`	`# Install python lib and __init__.py files`
`116`		`-install(TARGETS${SWIG_MODULE_avtranscoder-py_REAL_NAME}DESTINATION"lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/"OPTIONAL)`
	`117`	`+install(TARGETS${SWIG_MODULE_avtranscoder-py_REAL_NAME}DESTINATION${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}OPTIONAL)`
`117`	`118`	`install(CODE"file(WRITE${CMAKE_INSTALL_PREFIX}/${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}/__init__.py)")`
`118`	`119`	`else()`
`119`	`120`	`message("PYTHON not found, will not build python binding.")`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`# Get avtranscoder library`
`4`	`4`	`export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${DEPENDENCY_INSTALL}/lib`
`5`		`-export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7.6/site-packages/:$PYTHONPATH`
	`5`	`+export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7/site-packages/:$PYTHONPATH`
`6`	`6`
`7`	`7`	`# Get assets`
`8`	`8`	`git clone https://github.com/avTranscoder/avTranscoder-data.git`

Comments

(0)