Skip to content

Deploy python lib with python interface #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 9, 2015
Merged

Deploy python lib with python interface #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce30cb8
CMake: deploy avtranscoder python lib with python interface
Mar 31, 2015
b493e58
CMake: set rpath of avtranscoder-python lib
Mar 31, 2015
dbd4c6e
CMake: deploy java libs in lib/java
Apr 2, 2015
629a7a8
CMake: add build path in the linker search for avtranscoder shared li…
Apr 2, 2015
1d1d9ad
Travis: clean PYTHONPATH before launch tests
Apr 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ else()
endif()
set_target_properties(avtranscoder-shared PROPERTIES SOVERSION ${AVTRANSCODER_VERSION_MAJOR})
set_target_properties(avtranscoder-shared PROPERTIES VERSION ${AVTRANSCODER_VERSION})
set_target_properties(avtranscoder-shared PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries(avtranscoder-shared ${FFMPEG_LIBRARIES})
target_include_directories(avtranscoder-shared PUBLIC
${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
Expand All @@ -48,11 +49,8 @@ install(
PATTERN "*.hpp"
PATTERN "*.i"
)
set(LIBRARY_OUTPUT_PATH "${PROJECT_BINARY_DIR}/lib")
install(
DIRECTORY "${LIBRARY_OUTPUT_PATH}"
DESTINATION "${CMAKE_INSTALL_PREFIX}"
)
install(TARGETS avtranscoder-static DESTINATION lib/)
install(TARGETS avtranscoder-shared DESTINATION lib/)

### Install AvTranscoder ressource
install(
Expand Down Expand Up @@ -97,6 +95,13 @@ if(SWIG_FOUND)
set_target_properties(${SWIG_MODULE_avtranscoder-py_REAL_NAME} PROPERTIES SOVERSION ${AVTRANSCODER_VERSION_MAJOR})
set_target_properties(${SWIG_MODULE_avtranscoder-py_REAL_NAME} PROPERTIES VERSION ${AVTRANSCODER_VERSION})
endif()
# Force the library to look in the project lib folder relatively
set_target_properties(${SWIG_MODULE_avtranscoder-py_REAL_NAME} PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
if(APPLE)
set_target_properties(${SWIG_MODULE_avtranscoder-py_REAL_NAME} PROPERTIES INSTALL_RPATH "@loader_path/../../..")
else()
set_target_properties(${SWIG_MODULE_avtranscoder-py_REAL_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../../..:$ORIGIN")
endif()
swig_link_libraries(avtranscoder-py avtranscoder-shared ${PYTHON_LIBRARIES})

# Install python interface
Expand All @@ -106,7 +111,8 @@ if(SWIG_FOUND)
FILES ${AVTRANSCODER_PYTHON_BINDING_FILE} ${AVTRANSCODER_PYTHON_INIT_FILE}
DESTINATION ${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}
)
# Install __init__.py
# Install python lib and __init__.py files
install(TARGETS ${SWIG_MODULE_avtranscoder-py_REAL_NAME} DESTINATION "lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/")
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 Expand Up @@ -136,6 +142,13 @@ if(SWIG_FOUND)
set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES SOVERSION ${AVTRANSCODER_VERSION_MAJOR})
set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES VERSION ${AVTRANSCODER_VERSION})
endif()
# Force the library to look in the project lib folder relatively
set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
if(APPLE)
set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES INSTALL_RPATH "@loader_path/..")
else()
set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/..:$ORIGIN")
endif()
swig_link_libraries(avtranscoder-java avtranscoder-shared)

# Post build of java binding : compile java files (generate class files) and create jar
Expand All @@ -152,7 +165,8 @@ if(SWIG_FOUND)
COMMAND ${Java_JAR_EXECUTABLE} cf ${AVTRANSCODER_JAR_NAME} "-C" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "."
)

# Install jar file
# Install java lib and jar files
install(TARGETS ${SWIG_MODULE_avtranscoder-java_REAL_NAME} DESTINATION "lib/java")
install(FILES ${AVTRANSCODER_JAR_PATH}/${AVTRANSCODER_JAR_NAME} DESTINATION "share/java/")
else()
message("JAVA not found, will not build java binding.")
Expand Down
2 changes: 1 addition & 1 deletion tools/travis.python.nosetests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Get avtranscoder library
export PYTHONPATH=`pwd`/build/dist/lib:`pwd`/build/dist/lib/python2.7.6/site-packages/:$PYTHONPATH
export PYTHONPATH=`pwd`/build/dist/lib/python2.7.6/site-packages/:$PYTHONPATH

# Get avtranscoder profiles
export AVPROFILES=`pwd`/build/dist/share/ressource
Expand Down