From d8edd42c64d624a1a18a8687c8f189cdd8423a81 Mon Sep 17 00:00:00 2001 From: mpromonet Date: Sat, 14 May 2022 16:26:20 +0200 Subject: [PATCH] fix #279: allow to use static live --- ...ment.cmake => FindlibBasicUsageEnvironment.cmake} | 0 ...vironment.cmake => FindlibUsageEnvironment.cmake} | 0 .../{FindGroupSock.cmake => Findlibgroupsock.cmake} | 0 .../{FindLiveMedia.cmake => FindlibliveMedia.cmake} | 0 CMakeLists.txt | 12 ++++++------ 5 files changed, 6 insertions(+), 6 deletions(-) rename CMake/{FindBasicUsageEnvironment.cmake => FindlibBasicUsageEnvironment.cmake} (100%) rename CMake/{FindUsageEnvironment.cmake => FindlibUsageEnvironment.cmake} (100%) rename CMake/{FindGroupSock.cmake => Findlibgroupsock.cmake} (100%) rename CMake/{FindLiveMedia.cmake => FindlibliveMedia.cmake} (100%) diff --git a/CMake/FindBasicUsageEnvironment.cmake b/CMake/FindlibBasicUsageEnvironment.cmake similarity index 100% rename from CMake/FindBasicUsageEnvironment.cmake rename to CMake/FindlibBasicUsageEnvironment.cmake diff --git a/CMake/FindUsageEnvironment.cmake b/CMake/FindlibUsageEnvironment.cmake similarity index 100% rename from CMake/FindUsageEnvironment.cmake rename to CMake/FindlibUsageEnvironment.cmake diff --git a/CMake/FindGroupSock.cmake b/CMake/Findlibgroupsock.cmake similarity index 100% rename from CMake/FindGroupSock.cmake rename to CMake/Findlibgroupsock.cmake diff --git a/CMake/FindLiveMedia.cmake b/CMake/FindlibliveMedia.cmake similarity index 100% rename from CMake/FindLiveMedia.cmake rename to CMake/FindlibliveMedia.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 9882c0c..8d5a9f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,14 +61,14 @@ find_package(OpenSSL QUIET) MESSAGE("OpenSSL_FOUND = ${OpenSSL_FOUND}") # live555 -find_package(LiveMedia) -find_package(UsageEnvironment) -find_package(BasicUsageEnvironment) -find_package(GroupSock) +find_package(libliveMedia) +find_package(libUsageEnvironment) +find_package(libBasicUsageEnvironment) +find_package(libgroupsock) if (LIBLIVEMEDIA_FOUND AND LIBBASICUSAGEENVIRONMENT_FOUND AND LIBUSAGEENVIRONMENT_FOUND AND LIBGROUPSOCK_FOUND) message(STATUS "live555 loaded") set(LIVEINCLUDE ${LIBLIVEMEDIA_INCLUDE_DIR} ${LIBBASICUSAGEENVIRONMENT_INCLUDE_DIR} ${LIBUSAGEENVIRONMENT_INCLUDE_DIR} ${LIBGROUPSOCK_INCLUDE_DIR}) - target_link_libraries (${PROJECT_NAME} ${LIBLIVEMEDIA_LIBRARY} ${LIBUSAGEENVIRONMENT_LIBRARY} ${LIBBASICUSAGEENVIRONMENT_LIBRARY} ${LIBGROUPSOCK_LIBRARY}) + SET(LIVE_LIBRARIES ${LIBLIVEMEDIA_LIBRARY} ${LIBUSAGEENVIRONMENT_LIBRARY} ${LIBBASICUSAGEENVIRONMENT_LIBRARY} ${LIBGROUPSOCK_LIBRARY}) SET(CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS}livemedia-utils,) else() set(LIVE ${CMAKE_BINARY_DIR}/live) @@ -91,7 +91,7 @@ endif() aux_source_directory(src LIBV4L2RTSP_SRC_FILES) add_library (libv4l2rtspserver STATIC ${LIVESOURCE} ${LIBV4L2RTSP_SRC_FILES}) target_include_directories(libv4l2rtspserver PUBLIC inc ${LIVEINCLUDE}) -target_link_libraries (${PROJECT_NAME} libv4l2rtspserver) +target_link_libraries (${PROJECT_NAME} libv4l2rtspserver ${LIVE_LIBRARIES}) if (OpenSSL_FOUND) target_link_libraries(${PROJECT_NAME} OpenSSL::SSL) endif ()