diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 89182f9..fd925b0 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -26,6 +26,7 @@ ENDIF() set(plaYUver_Lib_HEADERS + PlaYUVerDefs.h PlaYUVerFrame.h PlaYUVerStream.h ) @@ -41,7 +42,7 @@ set(plaYUver_Lib_HEADERS # ENDIF() # ENDIF() -CONFIGURE_FILE( PlaYUVerConfig.cmake.in ${CMAKE_BINARY_DIR}/PlaYUVerConfig.cmake @ONLY) +CONFIGURE_FILE( PlaYUVerConfig.cmake.in PlaYUVerConfig.cmake @ONLY) ADD_LIBRARY( PlaYUVerLib STATIC ${plaYUver_Lib_SRCS} ) @@ -49,5 +50,6 @@ INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS} ) TARGET_LINK_LIBRARIES( PlaYUVerLib ${FFMPEG_LIBRARIES} ${OpenCV_LIBRARIES} ) INSTALL(FILES ${plaYUver_Lib_HEADERS} DESTINATION include ) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/PlaYUVerConfig.cmake DESTINATION share/PlaYUVer ) # INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libPlaYUVerLib${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION lib ) INSTALL(TARGETS PlaYUVerLib DESTINATION lib ) diff --git a/lib/PlaYUVerConfig.cmake.in b/lib/PlaYUVerConfig.cmake.in index 6d4cf3e..c31a806 100644 --- a/lib/PlaYUVerConfig.cmake.in +++ b/lib/PlaYUVerConfig.cmake.in @@ -20,8 +20,6 @@ # - PLAYUVER_LINKER_LIBS : The list of all imported targets for OpenCV modules. # - PLAYUVER_CXX_FLAGS # - PLAYUVER_INCLUDE_DIRS : The PlaYUVer include directories. -# - PLAYUVER_COMPUTE_CAPABILITIES : The version of compute capability -# - PLAYUVER_ANDROID_NATIVE_API_LEVEL : Minimum required level of Android API # - PLAYUVER_VERSION : The version of this PlaYUVer build: "@PLAYUVER_VERSION@" # - PLAYUVER_VERSION_MAJOR : Major version part of PLAYUVER_VERSION: "@PLAYUVER_VERSION_MAJOR@" # - PLAYUVER_VERSION_MINOR : Minor version part of PLAYUVER_VERSION: "@PLAYUVER_VERSION_MINOR@" @@ -50,25 +48,14 @@ LIST(APPEND PLAYUVER_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/include ) # ====================================================== SET( PLAYUVER_HAS_OPENCV @USE_OPENCV@ ) -SET( PLAYUVER_HAS_QT4 @USE_QT4@ ) +SET( PLAYUVER_HAS_FFMPEG @USE_FFMPEG@ ) -IF( PLAYUVER_HAS_QT4 ) - FIND_PACKAGE( Qt4 REQUIRED QtCore ) - IF( NOT QT4_FOUND) - SET(USE_QT4 FALSE) - ENDIF() - 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} ) +IF( PLAYUVER_HAS_FFMPEG ) + LIST(APPEND PLAYUVER_LINKER_LIBS @OpenCV_LIBRARIES@ ) ENDIF() - + + IF( PLAYUVER_HAS_OPENCV ) - FIND_PACKAGE( OpenCV ) - LIST(APPEND PLAYUVER_LINKER_LIBS ${OpenCV_LIBRARIES} ) + LIST(APPEND PLAYUVER_LINKER_LIBS @OpenCV_LIBRARIES@ ) ENDIF()