From 762251329bca80422a8e65d0cdb36e86e84883cf Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 27 九月 2019 11:11:45 +0800
Subject: [PATCH] bug fix
---
CMakeLists.txt | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 041e3d4..5ef89c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,9 +21,10 @@
${CMAKE_SOURCE_DIR}/csrc/thirdparty
${CMAKE_SOURCE_DIR}/csrc/thirdparty/whereami
${CMAKE_SOURCE_DIR}/csrc/thirdparty/ffmpeg/include
+ ${CMAKE_SOURCE_DIR}/csrc/thirdparty/gb28181/include
)
-link_directories(/usr/local/cuda/lib64)
+link_directories(/usr/local/cuda/lib64 ${CMAKE_SOURCE_DIR}/csrc/thirdparty/gb28181/lib)
set(CMAKE_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/csrc/thirdparty/ffmpeg/lib ${CMAKE_LIBRARY_PATH})
find_library(avutil NAMES libavutil.a )
@@ -47,8 +48,6 @@
file(GLOB_RECURSE FFMPEG_LIST ${CMAKE_SOURCE_DIR}/csrc/*.cpp)
list(APPEND FFMPEG_LIST ${CMAKE_SOURCE_DIR}/csrc/thirdparty/whereami/whereami.c)
-add_library(${BIN} SHARED ${FFMPEG_LIST} ${CMAKE_SOURCE_DIR}/csrc/cffmpeg.cpp)
-add_custom_command(TARGET ${BIN}
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/build/lib${BIN}.so ${CMAKE_SOURCE_DIR}/../lib)
-target_link_libraries(${BIN} ${LINK_LIB} numa nppig nppicc nppc -lz pthread dl)
+add_library(${BIN} SHARED ${FFMPEG_LIST})
+
+target_link_libraries(${BIN} ${LINK_LIB} numa nppig nppicc nppc -lz pthread dl rtspclient StreamParse)
--
Gitblit v1.8.0