make boost lib optional

This commit is contained in:
jfmcarreira committed 2015-03-11 00:45:20 +00:00
1 parent fd63d8403d
commit 9e7410ae0e
3 files changed
+15 -6

No files matched your search

+7 -4
View File
@@ -78,8 +78,9 @@ OPTION( USE_WERROR "Warnings as errors" OFF )
# Dependencies
######################################################################################
FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options )
SET_PACKAGE_PROPERTIES(Boost PROPERTIES URL "http://www.boost.org" DESCRIPTION "Boost library support" TYPE REQUIRED)
FIND_PACKAGE(Boost COMPONENTS program_options )
SET_PACKAGE_PROPERTIES(Boost PROPERTIES URL "http://www.boost.org" DESCRIPTION "Boost library support" TYPE OPTIONAL)
SET(USE_BOOST ${Boost_FOUND})
OPTION( USE_OPENCV "Add OpenCV support" ON )
IF( USE_OPENCV )
@@ -131,8 +132,10 @@ ADD_FEATURE_INFO(PlaYUVerTools PLAYUVER_BUILD_APP "Build Command line too
ADD_SUBDIRECTORY( lib )
ADD_SUBDIRECTORY( modules )
IF( ${PLAYUVER_BUILD_TOOLS} )
ADD_SUBDIRECTORY( tools )
IF( ${USE_BOOST} )
IF( ${PLAYUVER_BUILD_TOOLS} )
ADD_SUBDIRECTORY( tools )
ENDIF()
ENDIF()
IF( ${PLAYUVER_BUILD_APP} )
+3
View File
@@ -53,6 +53,9 @@
#cmakedefine PLAYUVER_THREADED_MODULES
/* Boost support */
#cmakedefine USE_BOOST
/* OpenCV */
#cmakedefine USE_OPENCV
+5 -2
View File
@@ -13,10 +13,13 @@ set(plaYUver_Lib_SRCS
PlaYUVerFrameStats.cpp
# Stream
PlaYUVerStream.cpp
# Command Line Parser
PlaYUVerCmdParser.cpp
)
IF( USE_FFMPEG )
# Command Line Parser
LIST( APPEND plaYUver_Lib_SRCS PlaYUVerCmdParser.cpp )
ENDIF()
IF( USE_FFMPEG )
LIST( APPEND plaYUver_Lib_SRCS LibAvContextHandle.cpp )
ENDIF()