Archives/v4l2rtspserver
2
0
Fork 0
mirror of https://github.com/mpromonet/v4l2rtspserver synced 2024-11-09 19:11:09 +00:00
Code Issues Projects Releases Wiki Activity

try to fix DEB dependencies and add TGZ

Browse Source
This commit is contained in:
Michel Promonet 2018-01-20 18:43:12 +01:00
parent a752fe39af
commit 4030cdef1b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -30,20 +30,23 @@ script:
- if [ "$TOOLCHAIN" != "" ]; then cmake -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN . ; fi - if [ "$TOOLCHAIN" != "" ]; then cmake -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN . ; fi
- if [ "$TOOLCHAIN" == "" ]; then cmake .; fi - if [ "$TOOLCHAIN" == "" ]; then cmake .; fi
#build #build
- make && cpack . - make
- cpack .
- cpack -G TGZ .
#run coverage test #run coverage test
- if [ "$COVERAGE" != "" ]; then cmake -DCOVERAGE=ON . && make && make test; fi - if [ "$COVERAGE" != "" ]; then cmake -DCOVERAGE=ON . && make && make test; fi
after_success: after_success:
- if [ "$COVERAGE" != "" ]; then coveralls --gcov-options '\-lp'; fi - if [ "$COVERAGE" != "" ]; then coveralls --gcov-options '\-lp'; fi
before_deploy: before_deploy:
- export RELEASE_PKG_FILE=$(ls *.deb) - export RELEASE_DEB_FILE=$(ls *.deb)
- echo "deploying ${RELEASE_PKG_FILE} to GitHub releases" - export RELEASE_TGZ_FILE=$(ls *.tar.gz)
deploy: deploy:
provider: releases provider: releases
api_key: api_key:
secure: gcQy7QO09vfGtcRMi8D+6VykDfK1tuz1jEZRmJER6eZ0p2gRi4F6mtsMRJWt3QsKkZQWkJpPTvCfv9GyNmWTrZV746y5QVnd+mjPx+6K/LgroK4LWgOgzJ6zQ6qfDKU80GbxJOnNv9/HmIcxSCiactxS50tbvntqpBGCmiIL+4U= secure: gcQy7QO09vfGtcRMi8D+6VykDfK1tuz1jEZRmJER6eZ0p2gRi4F6mtsMRJWt3QsKkZQWkJpPTvCfv9GyNmWTrZV746y5QVnd+mjPx+6K/LgroK4LWgOgzJ6zQ6qfDKU80GbxJOnNv9/HmIcxSCiactxS50tbvntqpBGCmiIL+4U=
file: file:
- "${RELEASE_PKG_FILE}" - "${RELEASE_DEB_FILE}"
- "${RELEASE_TGZ_FILE}"
skip_cleanup: true skip_cleanup: true
on: on:
repo: mpromonet/v4l2rtspserver repo: mpromonet/v4l2rtspserver

9
CMakeLists.txt
View File

@ -51,6 +51,8 @@ if (ALSA_LIBRARY)
message(STATUS "Alsa available") message(STATUS "Alsa available")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_ALSA") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_ALSA")
target_link_libraries (${PROJECT_NAME} ${ALSA_LIBRARY}) target_link_libraries (${PROJECT_NAME} ${ALSA_LIBRARY})
SET(CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS},libasound2-dev)
endif (ALSA_LIBRARY) endif (ALSA_LIBRARY)
# LOG4CPP # LOG4CPP
@ -62,15 +64,19 @@ if (LOG4CPP_INCLUDE_DIR)
find_library(LOG4CPP_LIBRARY log4cpp) find_library(LOG4CPP_LIBRARY log4cpp)
target_link_libraries(${PROJECT_NAME} "${LOG4CPP_LIBRARY}") target_link_libraries(${PROJECT_NAME} "${LOG4CPP_LIBRARY}")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS},liblog4cpp5-dev)
endif (LOG4CPP_INCLUDE_DIR) endif (LOG4CPP_INCLUDE_DIR)
# live555 # live555
find_path(LIBLIVE555_INCLUDE_DIR liveMedia/liveMedia.hh) find_path(LIBLIVE555_INCLUDE_DIR liveMedia/liveMedia.hh)
if (NOT LIBLIVE555_INCLUDE_DIR) if (NOT LIBLIVE555_INCLUDE_DIR)
message(STATUS "Installing live55") message(STATUS "Installing live555")
EXEC_PROGRAM("wget http://www.live555.com/liveMedia/public/live555-latest.tar.gz -O - | tar xzf -") EXEC_PROGRAM("wget http://www.live555.com/liveMedia/public/live555-latest.tar.gz -O - | tar xzf -")
EXEC_PROGRAM("cd live && ./genMakefiles linux-gdb && make CPLUSPLUS_COMPILER=${CMAKE_CXX_COMPILER} C_COMPILER=${CMAKE_C_COMPILER} LINK='${CMAKE_CXX_COMPILER} -o' PREFIX=${CMAKE_FIND_ROOT_PATH} install") EXEC_PROGRAM("cd live && ./genMakefiles linux-gdb && make CPLUSPLUS_COMPILER=${CMAKE_CXX_COMPILER} C_COMPILER=${CMAKE_C_COMPILER} LINK='${CMAKE_CXX_COMPILER} -o' PREFIX=${CMAKE_FIND_ROOT_PATH} install")
else (NOT LIBLIVE555_INCLUDE_DIR)
SET(CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS},livemedia-utils)
endif (NOT LIBLIVE555_INCLUDE_DIR) endif (NOT LIBLIVE555_INCLUDE_DIR)
find_path(LIBLIVE555_INCLUDE_DIR liveMedia/liveMedia.hh) find_path(LIBLIVE555_INCLUDE_DIR liveMedia/liveMedia.hh)
@ -97,7 +103,6 @@ install (TARGETS ${PROJECT_NAME} DESTINATION bin)
SET(CPACK_GENERATOR "DEB") SET(CPACK_GENERATOR "DEB")
SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Michel Promonet") SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Michel Promonet")
SET(CPACK_PACKAGE_CONTACT "michel.promonet@free.fr") SET(CPACK_PACKAGE_CONTACT "michel.promonet@free.fr")
SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}) SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
find_package(Git) find_package(Git)
if(VERSION) if(VERSION)