Fix cmake/PlaYUVerConfig.cmake.in

This commit is contained in:
jfmcarreira committed 2014-06-23 16:50:02 +01:00
1 parent 5a34607ef9
commit 20e593aa4b
1 file changed
+6 -7
+6 -7
View File
@@ -42,9 +42,8 @@ SET( PLAYUVER_LINKER_LIBS "" )
SET( PLAYUVER_CXX_FLAGS "" )
SET( PLAYUVER_INCLUDE_DIRS "" )
LIST(APPEND PLAYUVER_LINKER_LIBS "PlaYUVerFrame" )
LIST(APPEND PLAYUVER_LINKER_LIBS "PlaYUVerStream" )
LIST(APPEND PLAYUVER_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include )
LIST(APPEND PLAYUVER_LINKER_LIBS "PlaYUVerLib" )
LIST(APPEND PLAYUVER_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/include )
# ======================================================
# PlaYUVer dependencies:
@@ -54,7 +53,6 @@ SET( PLAYUVER_HAS_OPENCV @USE_OPENCV@ )
SET( PLAYUVER_HAS_QT4 @USE_QT4@ )
IF( PLAYUVER_HAS_QT4 )
FIND_PACKAGE( Qt4 REQUIRED QtCore )
IF( NOT QT4_FOUND)
SET(USE_QT4 FALSE)
@@ -62,14 +60,15 @@ IF( PLAYUVER_HAS_QT4 )
INCLUDE( ${QT_USE_FILE} )
ADD_DEFINITIONS( ${QT_DEFINITIONS} )
LIST(APPEND PLAYUVER_LIBS ${QT_LIBRARIES} )
ELSE()
FIND_PACKAGE( Qt5Core REQUIRED )
LIST(APPEND PLAYUVER_INCLUDE_DIRS ${Qt5Core_INCLUDE_DIRS} )
LIST(APPEND PLAYUVER_CXX_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS} )
LIST(APPEND PLAYUVER_LINKER_LIBS ${Qt5Core_LIBRARIES} )
ENDIF()
IF( PLAYUVER_HAS_OPENCV )
FIND_PACKAGE( OpenCV )
LIST(APPEND PLAYUVER_LINKER_LIBS ${OpenCV_LIBRARIES} )
ENDIF()