From 9e7410ae0eefa8a4b5a75f399827769dc61f9b29 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Wed, 11 Mar 2015 00:45:20 +0000 Subject: [PATCH] make boost lib optional --- CMakeLists.txt | 11 +++++++---- config.h.in | 3 +++ lib/CMakeLists.txt | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2ac2d3..3e97c8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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} ) diff --git a/config.h.in b/config.h.in index 05af68a..8806e27 100644 --- a/config.h.in +++ b/config.h.in @@ -53,6 +53,9 @@ #cmakedefine PLAYUVER_THREADED_MODULES +/* Boost support */ +#cmakedefine USE_BOOST + /* OpenCV */ #cmakedefine USE_OPENCV diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 30f4bbe..07b9c5e 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -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()