Skip to content

Commit 69bef53

Browse files
cchampetClement Champetier
authored andcommitted
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
1 parent e325ae9 commit 69bef53

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

app/cpp/avplay/CMakeLists.txt

Lines changed: 20 additions & 9 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

@@ -18,12 +29,12 @@ target_link_libraries(avplay avtranscoder-shared ${OPENGL_LIBRARIES} ${GLUT_LIBR
1829

1930
# Install app
2031
install(
21-
FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay" "${CMAKE_CURRENT_BINARY_DIR}/avplay-${AVTRANSCODER_VERSION}"
22-
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
23-
DESTINATION "bin/"
32+
FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay" "${CMAKE_CURRENT_BINARY_DIR}/avplay-${AVTRANSCODER_VERSION}"
33+
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
34+
DESTINATION "bin/"
2435
)
2536
install(
26-
FILES ${CMAKE_CURRENT_SOURCE_DIR}/avplayer.man
27-
RENAME avplayer.1
28-
DESTINATION "share/man/man1/"
37+
FILES ${CMAKE_CURRENT_SOURCE_DIR}/avplayer.man
38+
RENAME avplayer.1
39+
DESTINATION "share/man/man1/"
2940
)

0 commit comments

Comments
 (0)