Update cmake to cope with opencv comp and remove unused include in ffmepg
This commit is contained in:
1 parent
18f61358b2
commit
29660d6a11
2 files changed
+5
-1
No files matched your search
@@ -50,6 +50,10 @@ IF( UNIX )
|
|||||||
ELSE()
|
ELSE()
|
||||||
LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5core5a, libqt5gui5, libqt5widgets5")
|
LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5core5a, libqt5gui5, libqt5widgets5")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
IF( USE_OPENCV )
|
||||||
|
LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ",")
|
||||||
|
LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libopencv-dev")
|
||||||
|
ENDIF()
|
||||||
IF( USE_FFMPEG )
|
IF( USE_FFMPEG )
|
||||||
LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ",")
|
LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ",")
|
||||||
LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libavformat53 (>= 6:0.8.10~), libcodec53 (>= 6:0.8.3-1~), libavutil51 (>= 6:0.8.3-1~)")
|
LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libavformat53 (>= 6:0.8.10~), libcodec53 (>= 6:0.8.3-1~), libavutil51 (>= 6:0.8.3-1~)")
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ extern "C"
|
|||||||
#include <libavutil/avutil.h>
|
#include <libavutil/avutil.h>
|
||||||
#include <libavutil/imgutils.h>
|
#include <libavutil/imgutils.h>
|
||||||
#include <libavutil/samplefmt.h>
|
#include <libavutil/samplefmt.h>
|
||||||
#include <libavutil/timestamp.h>
|
//#include <libavutil/timestamp.h>
|
||||||
#include <libavformat/avformat.h>
|
#include <libavformat/avformat.h>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user