Compare commits

...

3 Commits

Author SHA1 Message Date
Michel Promonet 21796e146d fix link 1 month ago
Michel Promonet eafa8d6931 add alsa in dependency 1 month ago
Michel Promonet 5a938d8e51 fix patch path when include in another project 1 month ago

@ -87,7 +87,7 @@ else()
message(FATAL_ERROR "Fetching and compiling live555 failed!")
endif()
message(STATUS "patch live555")
EXECUTE_PROCESS(COMMAND patch -d ${CMAKE_BINARY_DIR} -f -p 1 -i ${CMAKE_SOURCE_DIR}/patches/001_live555_sprintf_format RESULT_VARIABLE patch_result)
EXECUTE_PROCESS(COMMAND patch -d ${CMAKE_BINARY_DIR} -f -p 1 -i ${PROJECT_SOURCE_DIR}/patches/001_live555_sprintf_format RESULT_VARIABLE patch_result)
if(NOT patch_result STREQUAL "0")
message(FATAL_ERROR "Patching live555 failed! error:${patch_result}")
endif()
@ -104,8 +104,9 @@ add_library (libv4l2rtspserver STATIC ${LIVESOURCE} ${LIBV4L2RTSP_SRC_FILES})
target_include_directories(libv4l2rtspserver PUBLIC inc ${LIVEINCLUDE})
target_compile_definitions(libv4l2rtspserver PUBLIC ${LIVE555CFLAGS})
target_link_libraries (${PROJECT_NAME} libv4l2rtspserver ${LIVE_LIBRARIES})
set (LIBRARIES "")
if (OpenSSL_FOUND)
target_link_libraries(${PROJECT_NAME} OpenSSL::SSL)
set(LIBRARIES ${LIBRARIES} ${OPENSSL_LIBRARIES})
endif ()
#ALSA
@ -114,7 +115,7 @@ if (ALSA)
MESSAGE("ALSA_FOUND = ${ALSA_FOUND}")
if (ALSA_LIBRARY)
add_definitions(-DHAVE_ALSA)
target_link_libraries (${PROJECT_NAME} ${ALSA_LIBRARY})
set(LIBRARIES ${LIBRARIES} ${ALSA_LIBRARY})
SET(CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS}libasound2,)
endif ()
@ -124,7 +125,7 @@ endif()
EXEC_PROGRAM("git submodule update --init")
add_subdirectory(libv4l2cpp EXCLUDE_FROM_ALL)
target_include_directories(libv4l2rtspserver PUBLIC libv4l2cpp/inc)
target_link_libraries (libv4l2rtspserver libv4l2cpp)
target_link_libraries (libv4l2rtspserver PUBLIC libv4l2cpp ${LIBRARIES})
# static link of stdc++ if available
if (STATICSTDCPP)

Loading…
Cancel
Save