Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2017-08-21 02:39:30 +01:00
commit d0e57c3dfd
3 files changed
+8 -7

No files matched your search

+1 -1
View File
@@ -54,5 +54,5 @@ TARGET_LINK_LIBRARIES( PlaYUVerLib ${FFMPEG_LIBRARIES} ${OpenCV_LIBRARIES} )
IF( NOT USE_STATIC )
INSTALL(FILES ${PlaYUVer_Lib_HEADERS} DESTINATION include )
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/PlaYUVerConfig.cmake DESTINATION share/playuver )
INSTALL(TARGETS PlaYUVerLib DESTINATION lib )
INSTALL(TARGETS PlaYUVerLib DESTINATION ${CMAKE_INSTALL_LIBDIR} )
ENDIF()