Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2015-11-17 16:29:39 +00:00
commit f56ca07f77
2 files changed
+10 -6

No files matched your search

+3
View File
@@ -27,6 +27,7 @@ OPTION( PLAYUVER_BUILD_EXEMPLES "Build Examples" OFF )
OPTION( USE_SSE "Build with SSE support" OFF )
OPTION( USE_FERVOR "Add Fervor support" OFF )
OPTION( USE_WERROR "Warnings as errors" OFF )
OPTION( USE_STATIC "Use static libs" ON )
OPTION( USE_QT4 "Build with Qt4" OFF )
OPTION( USE_QTDBUS "Build with Qt4" OFF )
OPTION( USE_DYNLOAD "Use dynamic load of modules" ON )
@@ -103,6 +104,7 @@ ADD_FEATURE_INFO(WErrors USE_WERROR "Warnings as errors" )
IF( WIN32 )
SET( USE_STATIC OFF )
INCLUDE( cmake/Win32.cmake )
ENDIF()
@@ -151,6 +153,7 @@ MESSAGE("")
MESSAGE( STATUS "${PROJECT_NAME} INFORMATION" )
MESSAGE( STATUS "Version: " "${PLAYUVER_VERSION_STRING}" )
MESSAGE( STATUS "Configuration:" )
MESSAGE( STATUS " Static libs: " "${USE_STATIC}" )
MESSAGE( STATUS " Build type: " "${CMAKE_BUILD_TYPE}" )
MESSAGE( STATUS " Build flags: " "${CMAKE_CXX_FLAGS}" )
+7 -6
View File
@@ -2,7 +2,7 @@
### CMakeLists for playuver lib component
###
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../ )
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../ )
set(plaYUver_Lib_SRCS
# Frame
@@ -47,7 +47,7 @@ set(plaYUver_Lib_HEADERS
CONFIGURE_FILE( PlaYUVerConfig.cmake.in PlaYUVerConfig.cmake @ONLY)
IF( WIN32 )
IF( USE_STATIC )
ADD_LIBRARY( PlaYUVerLib STATIC ${plaYUver_Lib_SRCS} )
ELSE()
ADD_LIBRARY( PlaYUVerLib SHARED ${plaYUver_Lib_SRCS} )
@@ -56,7 +56,8 @@ ENDIF()
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 )
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 )
ENDIF()