Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2015-09-22 16:08:11 +01:00
commit c7c33417c7
6 files changed
+17 -2

No files matched your search

+5 -1
View File
@@ -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} )