Skip to content

Commit 4158cfe

Browse files
Merge pull request #98 from cchampet/build_avplay_optionnal
CMake avplay: do not build the app if OpenGL or GLUT are not found
2 parents e325ae9 + 82505ef commit 4158cfe

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

app/cpp/avplay/CMakeLists.txt

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,21 @@
44
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
55
include(AvTranscoderMacros)
66

7-
# Build app
8-
find_package(OpenGL REQUIRED)
9-
find_package(GLUT REQUIRED)
7+
# Check OpenGL
8+
find_package(OpenGL)
9+
if(NOT OPENGL_FOUND)
10+
message("OpenGL not found, will not build avplay app.")
11+
return()
12+
endif()
13+
14+
# Check GLUT
15+
find_package(GLUT)
16+
if(NOT GLUT_FOUND)
17+
message("GLUT not found, will not build avplay app.")
18+
return()
19+
endif()
1020

21+
# Build app
1122
include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
1223
include_directories( ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} )
1324

0 commit comments

Comments
 (0)