From 82505ef8f6723459954bf7f29b1cc11dca396a46 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Sun, 21 Sep 2014 14:09:00 +0200 Subject: [PATCH] CMake avplay: do not build the app if OpenGL or GLUT are not found * Print a warning if avplay app can't be built. * Allow the user to build avTranscoder library even if dependencies of this app are not found. * fix #94 --- app/cpp/avplay/CMakeLists.txt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/cpp/avplay/CMakeLists.txt b/app/cpp/avplay/CMakeLists.txt index 61a1838b..2af5cf36 100644 --- a/app/cpp/avplay/CMakeLists.txt +++ b/app/cpp/avplay/CMakeLists.txt @@ -4,10 +4,21 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) include(AvTranscoderMacros) -# Build app -find_package(OpenGL REQUIRED) -find_package(GLUT REQUIRED) +# Check OpenGL +find_package(OpenGL) +if(NOT OPENGL_FOUND) + message("OpenGL not found, will not build avplay app.") + return() +endif() + +# Check GLUT +find_package(GLUT) +if(NOT GLUT_FOUND) + message("GLUT not found, will not build avplay app.") + return() +endif() +# Build app include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR}) include_directories( ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} )