Fix cmake and desktop files

This commit is contained in:
jfmcarreira committed 2016-05-15 01:50:42 +01:00
1 parent c2f2af7584
commit 9e7838ad27
8 files changed
+35 -33

No files matched your search

+1 -1
View File
@@ -49,6 +49,6 @@ 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(FILES ${CMAKE_CURRENT_BINARY_DIR}/PlaYUVerConfig.cmake DESTINATION share/playuver )
INSTALL(TARGETS PlaYUVerLib DESTINATION lib )
ENDIF()
+2 -9
View File
@@ -10,10 +10,6 @@
# include_directories(${PLAYUVER_INCLUDE_DIRS})
# target_link_libraries(MY_TARGET_NAME ${PLAYUVER_LINKER_LIBS})
#
# Or you can search for specific PlaYUVer modules:
#
# find_package(PlaYUVer REQUIRED Frame Stream)
#
# If the module is found then PLAYUVER_<MODULE>_FOUND is set to TRUE.
#
# This file will define the following variables:
@@ -47,16 +43,13 @@ LIST(APPEND PLAYUVER_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/include )
# PlaYUVer dependencies:
# ======================================================
SET( PLAYUVER_HAS_OPENCV @USE_OPENCV@ )
SET( PLAYUVER_HAS_FFMPEG @USE_FFMPEG@ )
IF( PLAYUVER_HAS_FFMPEG )
IF( @USE_OPENCV@ )
LIST(APPEND PLAYUVER_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} )
LIST(APPEND PLAYUVER_LINKER_LIBS @OpenCV_LIBRARIES@ )
ENDIF()
IF( PLAYUVER_HAS_OPENCV )
IF( @USE_FFMPEG@ )
LIST(APPEND PLAYUVER_INCLUDE_DIRS ${OpenCV_INCLUDE_DIRS} )
LIST(APPEND PLAYUVER_LINKER_LIBS @OpenCV_LIBRARIES@ )
ENDIF()