Skip to content

Don't build/install mp4subtitle by default #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ferdnyc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't build/install mp4subtitle by default #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set(CMAKE_CXX_STANDARD 11)

option(BUILD_SHARED "Build libmp4v2 as a shared library" ON)
option(BUILD_UTILS "Build MP4v2 auxiliary tools" ON)
option(BUILD_EXTRA_UTILS "Build MP4v2 tools with unimplemented functionality" OFF)

#
# Generate include/mp4v2/project.h and libplatform/config.h
Expand Down Expand Up @@ -91,7 +92,7 @@ function(configure_pkg_config_file pkg_config_file_in)
set(VERSION ${PROJECT_version})
string(REPLACE ".in" "" pkg_config_file ${pkg_config_file_in})
configure_file(${pkg_config_file_in} ${pkg_config_file} @ONLY)
endfunction()
endfunction()

configure_pkg_config_file(mp4v2.pc.in)

Expand Down Expand Up @@ -348,9 +349,6 @@ if(BUILD_UTILS)
add_executable(mp4info ${UTILITY_HEADER_FILES} util/mp4info.cpp)
target_link_libraries(mp4info mp4v2)

add_executable(mp4subtitle ${UTILITY_HEADER_FILES} util/mp4subtitle.cpp)
target_link_libraries(mp4subtitle mp4v2)

add_executable(mp4tags ${UTILITY_HEADER_FILES} util/mp4tags.cpp)
target_link_libraries(mp4tags mp4v2)

Expand All @@ -359,6 +357,12 @@ if(BUILD_UTILS)

add_executable(mp4trackdump ${UTILITY_HEADER_FILES} util/mp4trackdump.cpp)
target_link_libraries(mp4trackdump mp4v2)

if (BUILD_EXTRA_UTILS)
add_executable(mp4subtitle ${UTILITY_HEADER_FILES} util/mp4subtitle.cpp)
target_link_libraries(mp4subtitle mp4v2)
endif()

endif()

#
Expand All @@ -381,14 +385,21 @@ endif()
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mp4v2.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")

if(BUILD_UTILS)
install(TARGETS mp4art
mp4chaps
mp4extract
mp4file
mp4info
mp4subtitle
mp4tags
mp4track
mp4trackdump RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
set(_util_targets
mp4art
mp4chaps
mp4extract
mp4file
mp4info
mp4tags
mp4track
mp4trackdump
)
if(BUILD_EXTRA_UTILS)
list(APPEND _util_targets
mp4subtitle
)
endif()
install(TARGETS ${_util_targets}
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
endif()

17 changes: 13 additions & 4 deletions GNUmakefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,15 @@ if ADD_UTIL
bin_PROGRAMS += mp4extract
bin_PROGRAMS += mp4file
bin_PROGRAMS += mp4info
bin_PROGRAMS += mp4subtitle
bin_PROGRAMS += mp4tags
bin_PROGRAMS += mp4track
bin_PROGRAMS += mp4trackdump
endif

if ADD_EXTRA_UTIL
bin_PROGRAMS += mp4subtitle
endif

mp4art_SOURCES = util/impl.h util/mp4art.cpp
mp4chaps_SOURCES = util/impl.h util/mp4chaps.cpp
mp4extract_SOURCES = util/impl.h util/mp4extract.cpp
Expand Down Expand Up @@ -298,16 +301,22 @@ MK_CXX_I = \

###############################################################################

if ADD_UTIL
if ADD_MANS
man1_MANS = \
man1_MANS =

if ADD_UTIL
man1_MANS += \
doc/man/man1/mp4art.1 \
doc/man/man1/mp4chaps.1 \
doc/man/man1/mp4file.1 \
doc/man/man1/mp4subtitle.1 \
doc/man/man1/mp4tags.1 \
doc/man/man1/mp4track.1
endif

if ADD_EXTRA_UTIL
man1_MANS += doc/man/man1/mp4subtitle.1
endif

endif

###############################################################################
Expand Down
3 changes: 3 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ AC_ARG_ENABLE([largefile],
[AS_HELP_STRING([--disable-largefile],[disable LFS (large file support)])])
AC_ARG_ENABLE([util],
[AS_HELP_STRING([--disable-util],[disable build of command-line utilities])])
AC_ARG_ENABLE([extra-util],
[AS_HELP_STRING([--enable-extra-util],[enable build of utilities with unimplemented functionality])])
AC_ARG_ENABLE([gch],
[AS_HELP_STRING([--enable-gch],[enable use of precompiled headers])])
AC_ARG_ENABLE([bi],
Expand Down Expand Up @@ -355,6 +357,7 @@ AM_CONDITIONAL([ADD_PLATFORM_POSIX],[test "$X_PLATFORM" = "posix"])
AM_CONDITIONAL([ADD_PLATFORM_WIN32],[test "$X_PLATFORM" = "win32"])

AM_CONDITIONAL([ADD_UTIL],[test "$enable_util" != "no"])
AM_CONDITIONAL([ADD_EXTRA_UTIL],[test "$enable_extra_util" = "yes"])
AM_CONDITIONAL([ADD_MANS],[test "$X_PLATFORM" != "win32"])

###############################################################################
Expand Down