Change ebuild files
Fix some typos Fix variables names
This commit is contained in:
1 parent
13e49f054a
commit
3bb22528c3
3 files changed
+18
-23
No files matched your search
+4
-8
@@ -23,13 +23,13 @@ SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLA
|
||||
|
||||
OPTION( PLAYUVER_BUILD_APP "Build GUI Application" ON )
|
||||
OPTION( PLAYUVER_BUILD_TOOLS "Build Command Line Application" ON )
|
||||
OPTION( PLAYUVER_BUILD_EXEMPLES "Build Examples" OFF )
|
||||
OPTION( PLAYUVER_BUILD_EXAMPLES "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_QTDBUS "Build with QtDBus" OFF )
|
||||
OPTION( USE_DYNLOAD "Use dynamic load of modules" ON )
|
||||
# To be switched on when releasing.
|
||||
OPTION(RELEASE_BUILD "Remove Git revision from program version (use for stable releases)" ON)
|
||||
@@ -126,8 +126,8 @@ SET( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g" )
|
||||
SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2" )
|
||||
|
||||
|
||||
ADD_FEATURE_INFO(PlaYUVerApp PLAYUVER_BUILD_TOOLS "Build Graphical Interface")
|
||||
ADD_FEATURE_INFO(PlaYUVerTools PLAYUVER_BUILD_APP "Build Command line tool" )
|
||||
ADD_FEATURE_INFO(PlaYUVerApp PLAYUVER_BUILD_APP "Build Graphical Interface")
|
||||
ADD_FEATURE_INFO(PlaYUVerTools PLAYUVER_BUILD_TOOLS "Build Command line tool" )
|
||||
|
||||
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
|
||||
CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h )
|
||||
@@ -143,10 +143,6 @@ IF( ${PLAYUVER_BUILD_APP} )
|
||||
ADD_SUBDIRECTORY( app )
|
||||
ENDIF()
|
||||
|
||||
IF( ${PLAYUVER_BUILD_EXEMPLES} )
|
||||
ADD_SUBDIRECTORY( examples )
|
||||
ENDIF()
|
||||
|
||||
|
||||
######################################################################################
|
||||
# Final information dump
|
||||
|
||||
+7
-7
@@ -80,9 +80,9 @@ IF( USE_QTDBUS )
|
||||
ENDIF()
|
||||
|
||||
|
||||
set(plaYUver_App_UI "" )
|
||||
set(PlaYUVer_App_UI "" )
|
||||
|
||||
set(plaYUver_App_RCC
|
||||
set(PlaYUVer_App_RCC
|
||||
resources/playuver.qrc
|
||||
)
|
||||
|
||||
@@ -140,11 +140,11 @@ SET_PACKAGE_PROPERTIES(Fervor PROPERTIES URL "http://ffmpeg.org/" DESCRIPTION "F
|
||||
ADD_FEATURE_INFO(Fervor USE_FERVOR "Fervor lib includes check for updates feature.")
|
||||
|
||||
IF( USE_QT4 )
|
||||
QT4_WRAP_UI( plaYUver_App_UI_Wrap ${plaYUver_App_UI} )
|
||||
QT4_ADD_RESOURCES( plaYUver_App_RCC ${plaYUver_App_RCC} )
|
||||
QT4_WRAP_UI( PlaYUVer_App_UI_Wrap ${PlaYUVer_App_UI} )
|
||||
QT4_ADD_RESOURCES( PlaYUVer_App_RCC ${PlaYUVer_App_RCC} )
|
||||
ELSE()
|
||||
QT5_WRAP_UI( plaYUver_App_UI_Wrap ${plaYUver_App_UI} )
|
||||
QT5_ADD_RESOURCES( plaYUver_App_RCC ${plaYUver_App_RCC} )
|
||||
QT5_WRAP_UI( PlaYUVer_App_UI_Wrap ${PlaYUVer_App_UI} )
|
||||
QT5_ADD_RESOURCES( PlaYUVer_App_RCC ${PlaYUVer_App_RCC} )
|
||||
ENDIF()
|
||||
|
||||
# Instruct CMake to run moc automatically when needed.
|
||||
@@ -167,7 +167,7 @@ IF( WIN32 )
|
||||
ENDIF()
|
||||
|
||||
|
||||
ADD_EXECUTABLE( ${PROJECT_NAME} ${plaYUVer_App_SRCS} ${HEADERS_MOC_FILES} ${plaYUver_App_UI_Wrap} ${plaYUver_App_RCC} ${WINDOWS_RES_FILE} )
|
||||
ADD_EXECUTABLE( ${PROJECT_NAME} ${plaYUVer_App_SRCS} ${HEADERS_MOC_FILES} ${PlaYUVer_App_UI_Wrap} ${PlaYUVer_App_RCC} ${WINDOWS_RES_FILE} )
|
||||
|
||||
TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PlaYUVerLib PlaYUVerModules ${APP_LINKER_LIBS} ${QT_LINKER_LIBS} )
|
||||
|
||||
|
||||
+7
-8
@@ -4,7 +4,7 @@
|
||||
|
||||
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} )
|
||||
|
||||
set(plaYUver_Lib_SRCS
|
||||
set(PlaYUVer_Lib_SRCS
|
||||
# Frame
|
||||
PlaYUVerFrame.cpp
|
||||
PlaYUVerFramePixelFormats.cpp
|
||||
@@ -17,18 +17,17 @@ set(plaYUver_Lib_SRCS
|
||||
)
|
||||
|
||||
IF( USE_FFMPEG )
|
||||
LIST( APPEND plaYUver_Lib_SRCS LibAvContextHandle.cpp )
|
||||
LIST( APPEND PlaYUVer_Lib_SRCS LibAvContextHandle.cpp )
|
||||
ENDIF()
|
||||
|
||||
IF( USE_OPENCV )
|
||||
LIST( APPEND plaYUver_Lib_SRCS LibOpenCVHandler.cpp )
|
||||
LIST( APPEND PlaYUVer_Lib_SRCS LibOpenCVHandler.cpp )
|
||||
ENDIF()
|
||||
|
||||
|
||||
set(plaYUver_Lib_HEADERS
|
||||
set(PlaYUVer_Lib_HEADERS
|
||||
PlaYUVerDefs.h
|
||||
PlaYUVerProgramOptions.h
|
||||
# PlaYUVerFrameStats.h
|
||||
PlaYUVerFrame.h
|
||||
PlaYUVerStream.h
|
||||
PlaYUVerModuleIf.h
|
||||
@@ -48,16 +47,16 @@ set(plaYUver_Lib_HEADERS
|
||||
CONFIGURE_FILE( PlaYUVerConfig.cmake.in PlaYUVerConfig.cmake @ONLY)
|
||||
|
||||
IF( USE_STATIC )
|
||||
ADD_LIBRARY( PlaYUVerLib STATIC ${plaYUver_Lib_SRCS} )
|
||||
ADD_LIBRARY( PlaYUVerLib STATIC ${PlaYUVer_Lib_SRCS} )
|
||||
ELSE()
|
||||
ADD_LIBRARY( PlaYUVerLib SHARED ${plaYUver_Lib_SRCS} )
|
||||
ADD_LIBRARY( PlaYUVerLib SHARED ${PlaYUVer_Lib_SRCS} )
|
||||
ENDIF()
|
||||
|
||||
INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS} )
|
||||
TARGET_LINK_LIBRARIES( PlaYUVerLib ${FFMPEG_LIBRARIES} ${OpenCV_LIBRARIES} )
|
||||
|
||||
IF( NOT USE_STATIC )
|
||||
INSTALL(FILES ${plaYUver_Lib_HEADERS} DESTINATION include )
|
||||
INSTALL(FILES ${PlaYUVer_Lib_HEADERS} DESTINATION include )
|
||||
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/PlaYUVerConfig.cmake DESTINATION share/PlaYUVer )
|
||||
INSTALL(TARGETS PlaYUVerLib DESTINATION lib )
|
||||
ENDIF()
|
||||
Reference in new issue
Block a user