Merge branch 'master' into devel
This commit is contained in:
commit
c7c33417c7
6 files changed
+17
-2
No files matched your search
+5
-1
@@ -47,7 +47,11 @@ set(plaYUver_Lib_HEADERS
|
||||
|
||||
CONFIGURE_FILE( PlaYUVerConfig.cmake.in PlaYUVerConfig.cmake @ONLY)
|
||||
|
||||
ADD_LIBRARY( PlaYUVerLib SHARED ${plaYUver_Lib_SRCS} )
|
||||
IF( WIN32 )
|
||||
ADD_LIBRARY( PlaYUVerLib STATIC ${plaYUver_Lib_SRCS} )
|
||||
ELSE()
|
||||
ADD_LIBRARY( PlaYUVerLib SHARED ${plaYUver_Lib_SRCS} )
|
||||
ENDIF()
|
||||
|
||||
INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS} )
|
||||
TARGET_LINK_LIBRARIES( PlaYUVerLib ${FFMPEG_LIBRARIES} ${OpenCV_LIBRARIES} )
|
||||
|
||||
Reference in new issue
Block a user