From 029b40539380119bcd80a28e53607b2530d1b548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20L?= Date: Thu, 17 Jan 2019 09:25:40 +0100 Subject: fdk-aac encoder --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index a7318c77b6..56bc4e102e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -469,6 +469,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/effects/effectsmanager.cpp src/encoder/encoder.cpp src/encoder/encoderbroadcastsettings.cpp + src/encoder/encoderfdkaac.cpp + src/encoder/encoderfdkaacsettings.cpp src/encoder/encoderflacsettings.cpp src/encoder/encodermp3.cpp src/encoder/encodermp3settings.cpp -- cgit v1.2.3 From c844c8514308707d605602499b391ba14072433b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 8 Jan 2021 16:23:14 +0100 Subject: Renamed libshout folder to libshout-idjc --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 56bc4e102e..35b5f16df3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2353,8 +2353,8 @@ if(BROADCAST) if(NOT Shout_FOUND OR Shout_VERSION VERSION_LESS 2.4.4) # Fall back to internal libraray in the lib tree message(STATUS "Using internal libshout") - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/libshout") - target_include_directories(mixxx-lib SYSTEM PUBLIC lib/libshout/include) + add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/libshout-idjc") + target_include_directories(mixxx-lib SYSTEM PUBLIC lib/libshout/include-idjc) target_link_libraries(mixxx-lib PUBLIC shout_mixxx) else() target_link_libraries(mixxx-lib PUBLIC Shout::Shout) -- cgit v1.2.3 From 4ec8ceb2c977f70a3c7263fc0aa0f7d071fc3245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 8 Jan 2021 17:21:25 +0100 Subject: update to libshout-idjc-2.4.1 --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 35b5f16df3..1d28d4b2ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2343,16 +2343,16 @@ endif() # Live Broadcasting (Shoutcast) option(BROADCAST "Live Broadcasting (Shoutcast) support" ON) if(BROADCAST) - find_package(Shout) + find_package(Shoutidjc) if(UNIX AND NOT APPLE) # Check if system lib is at least 2.4.4 and not suffering bug # https://bugs.launchpad.net/mixxx/+bug/1833225 - if(Shout_FOUND AND Shout_VERSION VERSION_LESS 2.4.4) - message(STATUS "Installed libshout version: ${Shout_VERSION} is suffering from bug lp1833225") + if(Shoutidjc_FOUND AND Shoutidjc_VERSION VERSION_LESS 2.4.4) + message(STATUS "Installed libshout-idjc version: ${Shoutidjc_VERSION} is suffering from bug lp1833225") endif() - if(NOT Shout_FOUND OR Shout_VERSION VERSION_LESS 2.4.4) + if(NOT Shoutidjc_FOUND OR Shoutidjc_VERSION VERSION_LESS 2.4.4) # Fall back to internal libraray in the lib tree - message(STATUS "Using internal libshout") + message(STATUS "Using internal libshout-idjc") add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/libshout-idjc") target_include_directories(mixxx-lib SYSTEM PUBLIC lib/libshout/include-idjc) target_link_libraries(mixxx-lib PUBLIC shout_mixxx) @@ -2361,9 +2361,9 @@ if(BROADCAST) endif() else() if(NOT Shout_FOUND) - message(FATAL_ERROR "Live Broadcasting support requires the libshout and its development headers.") + message(FATAL_ERROR "Live Broadcasting support requires the libshout-idjc and its development headers.") endif() - target_link_libraries(mixxx-lib PUBLIC Shout::Shout) + target_link_libraries(mixxx-lib PUBLIC Shoutidjc::Shoutidjc) endif() target_sources(mixxx-lib PRIVATE src/preferences/dialog/dlgprefbroadcastdlg.ui -- cgit v1.2.3 From ee26074fa02d97360c516dbb74297edebbe47077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 9 Jan 2021 02:19:46 +0100 Subject: fix include files --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d28d4b2ae..a40d4818d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2354,7 +2354,7 @@ if(BROADCAST) # Fall back to internal libraray in the lib tree message(STATUS "Using internal libshout-idjc") add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/libshout-idjc") - target_include_directories(mixxx-lib SYSTEM PUBLIC lib/libshout/include-idjc) + target_include_directories(mixxx-lib SYSTEM PUBLIC lib/libshout-idjc/include) target_link_libraries(mixxx-lib PUBLIC shout_mixxx) else() target_link_libraries(mixxx-lib PUBLIC Shout::Shout) -- cgit v1.2.3 From dcf9895423b3cc28956ed6a5f05dfaa917a23261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 9 Jan 2021 14:47:07 +0100 Subject: Enable internal libshout-idjc for all targets --- CMakeLists.txt | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index a40d4818d6..018fcc5935 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2344,26 +2344,19 @@ endif() option(BROADCAST "Live Broadcasting (Shoutcast) support" ON) if(BROADCAST) find_package(Shoutidjc) - if(UNIX AND NOT APPLE) - # Check if system lib is at least 2.4.4 and not suffering bug - # https://bugs.launchpad.net/mixxx/+bug/1833225 - if(Shoutidjc_FOUND AND Shoutidjc_VERSION VERSION_LESS 2.4.4) - message(STATUS "Installed libshout-idjc version: ${Shoutidjc_VERSION} is suffering from bug lp1833225") - endif() - if(NOT Shoutidjc_FOUND OR Shoutidjc_VERSION VERSION_LESS 2.4.4) - # Fall back to internal libraray in the lib tree - message(STATUS "Using internal libshout-idjc") - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/libshout-idjc") - target_include_directories(mixxx-lib SYSTEM PUBLIC lib/libshout-idjc/include) - target_link_libraries(mixxx-lib PUBLIC shout_mixxx) - else() - target_link_libraries(mixxx-lib PUBLIC Shout::Shout) - endif() + # Check if system lib is at least 2.4.4 and not suffering bug + # https://bugs.launchpad.net/mixxx/+bug/1833225 + if(Shoutidjc_FOUND AND Shoutidjc_VERSION VERSION_LESS 2.4.4) + message(STATUS "Installed libshout-idjc version: ${Shoutidjc_VERSION} is suffering from bug lp1833225") + endif() + if(NOT Shoutidjc_FOUND OR Shoutidjc_VERSION VERSION_LESS 2.4.4) + # Fall back to internal libraray in the lib tree + message(STATUS "Using internal libshout-idjc") + add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/libshout-idjc") + target_include_directories(mixxx-lib SYSTEM PUBLIC lib/libshout-idjc/include) + target_link_libraries(mixxx-lib PUBLIC shout_mixxx) else() - if(NOT Shout_FOUND) - message(FATAL_ERROR "Live Broadcasting support requires the libshout-idjc and its development headers.") - endif() - target_link_libraries(mixxx-lib PUBLIC Shoutidjc::Shoutidjc) + target_link_libraries(mixxx-lib PUBLIC Shout::Shout) endif() target_sources(mixxx-lib PRIVATE src/preferences/dialog/dlgprefbroadcastdlg.ui -- cgit v1.2.3 From be0b0d20f971d25c38d61c20f4d58c3214d9e310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 28 Jan 2021 07:41:46 +0100 Subject: Fix linking to system installed libshout-idjc --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e1b1ac65f..92daa03281 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2325,7 +2325,7 @@ if(BROADCAST) target_include_directories(mixxx-lib SYSTEM PUBLIC lib/libshout-idjc/include) target_link_libraries(mixxx-lib PUBLIC shout_mixxx) else() - target_link_libraries(mixxx-lib PUBLIC Shout::Shout) + target_link_libraries(mixxx-lib PUBLIC Shoutidjc::Shoutidjc) endif() target_sources(mixxx-lib PRIVATE src/preferences/dialog/dlgprefbroadcastdlg.ui -- cgit v1.2.3 From 8bf2abf896ab4ebaad2dc48362564db385ca3779 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sat, 16 Jan 2021 16:07:22 +0100 Subject: CMake: Allow building if FFMPEG version is missing --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 334abc8e36..989d4fc380 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2228,22 +2228,22 @@ option(FFMPEG "FFmpeg 4.x support" OFF) if(FFMPEG) if(NOT FFMPEG_libavcodec_FOUND) message(FATAL_ERROR "FFmpeg support requires libavcodec and its development headers.") - elseif(FFMPEG_libavcodec_VERSION VERSION_LESS 58) + elseif(FFMPEG_libavcodec_VERSION AND FFMPEG_libavcodec_VERSION VERSION_LESS 58) message(FATAL_ERROR "FFmpeg support requires at least version 58 of libavcodec (found: ${AVCODEC_VERSION}).") endif() if(NOT FFMPEG_libavformat_FOUND) message(FATAL_ERROR "FFmpeg support requires libavformat and its development headers.") - elseif(FFMPEG_libavformat_VERSION VERSION_LESS 58) + elseif(FFMPEG_libavformat_VERSION AND FFMPEG_libavformat_VERSION VERSION_LESS 58) message(FATAL_ERROR "FFmpeg support requires at least version 58 of libavformat (found: ${AVFORMAT_VERSION}).") endif() if(NOT FFMPEG_libavutil_FOUND) message(FATAL_ERROR "FFmpeg support requires libavutil and its development headers.") - elseif(FFMPEG_libavutil_VERSION VERSION_LESS 56) + elseif(FFMPEG_libavutil_VERSION AND FFMPEG_libavutil_VERSION VERSION_LESS 56) message(FATAL_ERROR "FFmpeg support requires at least version 56 of libavutil (found: ${AVUTIL_VERSION}).") endif() if(NOT FFMPEG_libswresample_FOUND) message(FATAL_ERROR "FFmpeg support requires libswresample and its development headers.") - elseif(FFMPEG_libswresample_VERSION VERSION_LESS 3.1) + elseif(FFMPEG_libswresample_VERSION AND FFMPEG_libswresample_VERSION VERSION_LESS 3.1) message(FATAL_ERROR "FFmpeg support requires at least version 3.1 of libswresample (found: ${SWRESAMPLE_VERSION}).") endif() -- cgit v1.2.3 From d4db6a9e7d94b2f17c927465047302a6c0c46e82 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sat, 16 Jan 2021 01:00:10 +0100 Subject: CMake: Rewrite Ogg/Vorbis find module --- CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 989d4fc380..db50d5294f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1757,10 +1757,13 @@ set(OpenGL_GL_PREFERENCE "GLVND") find_package(OpenGL REQUIRED) target_link_libraries(mixxx-lib PUBLIC OpenGL::GL) -# Ogg Vorbis -find_package(OggVorbis REQUIRED) -target_include_directories(mixxx-lib SYSTEM PUBLIC ${OggVorbis_INCLUDE_DIRS}) -target_link_libraries(mixxx-lib PUBLIC ${OggVorbis_LIBRARIES}) +# Ogg +find_package(Ogg REQUIRED) +target_link_libraries(mixxx-lib PUBLIC Ogg::ogg) + +# Vorbis +find_package(Vorbis REQUIRED) +target_link_libraries(mixxx-lib PUBLIC Vorbis::vorbis Vorbis::vorbisenc Vorbis::vorbisfile) # PortAudio find_package(PortAudio REQUIRED) -- cgit v1.2.3 From 0c15373dc743e6c700659e062aac3056a1cf2f22 Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 3 Feb 2021 11:58:27 -0600 Subject: CMake: copy libfdk-aac into Windows and macOS packages --- CMakeLists.txt | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index db50d5294f..61b31dc1f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13.0) +cmake_minimum_required(VERSION 3.15.0) project(mixxx VERSION 2.3.0) set(CMAKE_PROJECT_HOMEPAGE_URL "https://www.mixxx.org") set(CMAKE_PROJECT_DESCRIPTION "Mixxx is Free DJ software that gives you everything you need to perform live mixes.") @@ -2224,6 +2224,26 @@ if(FAAD) endif() endif() +# FDK-AAC is loaded dynamically at runtime by EncoderFdkAac using QLibrary, +# so copy it into the Windows and macOS packages, but do not link to it. +find_library(FDK_AAC_LIBRARY fdk-aac) +# On Windows find_library finds the .lib file, but the installer needs the .dll file. +find_file(FDK_AAC_DLL fdk-aac.dll PATH_SUFFIXES ${CMAKE_INSTALL_BINDIR}) +if(APPLE AND MACOS_BUNDLE AND FDK_AAC_LIBRARY) + message(STATUS "Found fdk-aac: ${FDK_AAC_LIBRARY}") + file(COPY ${FDK_AAC_LIBRARY} + DESTINATION ${MIXXX_INSTALL_PREFIX}/Contents/Frameworks + FOLLOW_SYMLINK_CHAIN + ) +elseif(WIN32 AND FDK_AAC_DLL) + message(STATUS "Found fdk-aac DLL: ${FDK_AAC_DLL}") + install(FILES ${FDK_AAC_DLL} DESTINATION ${MIXXX_INSTALL_BINDIR}) +elseif(FDK_AAC_LIBRARY) + message(STATUS "Found fdk-aac: ${FDK_AAC_LIBRARY}") +else() + message(STATUS "Could NOT find fdk-aac") +endif() + # FFmpeg 4.x support # FFmpeg is multimedia library that can be found http://ffmpeg.org/ find_package(FFMPEG COMPONENTS libavcodec libavformat libavutil libswresample) -- cgit v1.2.3 From 7eceda88c79d7f01f9192b1c8879e4043f4b923b Mon Sep 17 00:00:00 2001 From: Be Date: Thu, 4 Feb 2021 10:28:22 -0600 Subject: CMake: cleanup hacks for legacy Windows build environment --- CMakeLists.txt | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 61b31dc1f4..e224dff8a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1352,6 +1352,25 @@ if(MSVC) ) endif() +if(WIN32) + find_file(QT_TRANSLATION_FILE qt_de.qm PATH_SUFFIXES share/qt5/translations) + get_filename_component(QT_TRANSLATIONS ${QT_TRANSLATION_FILE} DIRECTORY) + install( + DIRECTORY "${QT_TRANSLATIONS}" + DESTINATION "${MIXXX_INSTALL_DATADIR}" + # QT 5 translations have been separated into several files, and most of the qt_xx.qm files + # contain just shortcuts to load the qtbase, qtmultimedia etc files. + FILES_MATCHING REGEX + "qt_.+\.qm|qtbase_.*\.qm|qtmultimedia_.*\.qm|qtscript_.*\.qm|qtxmlpatterns_.*\.qm" + ) + + # Qt 5 loads these ANGLE DLLs at runtime if the graphics driver is blocklisted. + # Qt does not link these and vcpkg does not build them as a dependency of Qt, + # so copy them manually. + find_file(EGL_DLL libEGL.dll PATH_SUFFIXES ${CMAKE_INSTALL_BINDIR}) + find_file(GLESv2_DLL libGLESv2.dll PATH_SUFFIXES ${CMAKE_INSTALL_BINDIR}) + install(FILES ${EGL_DLL} ${GLESv2_DLL} DESTINATION "${MIXXX_INSTALL_BINDIR}") +endif() # # Tests @@ -1925,32 +1944,6 @@ elseif(WIN32) endif() endif() -# Qt5_DIR is not set until now, so this cannot be moved above with the rest of the install commands -if(WIN32) - install( - # I haven't seen a way to determine where the translations dir is, so I am making - # some assumptions here, and assuming that Qt5_DIR points to Qt-5.14.2/lib/cmake/Qt5 - # which is what my configuration tells me. - DIRECTORY - "${Qt5_DIR}/../../../translations" - DESTINATION - "${MIXXX_INSTALL_DATADIR}" - # QT 5 translations have been separated into several files, and most of the qt_xx.qm files - # contain just shortcuts to load the qtbase, qtmultimedia etc files. - FILES_MATCHING REGEX - "qt_.+\.qm|qtbase_.*\.qm|qtmultimedia_.*\.qm|qtscript_.*\.qm|qtxmlpatterns_.*\.qm" - ) - - # ANGLE DLLs are dynamically linked even when the rest of Qt is built statically - install( - FILES - "${Qt5_DIR}/../../../bin/libEGL.dll" - "${Qt5_DIR}/../../../bin/libGLESv2.dll" - DESTINATION - "${MIXXX_INSTALL_DATADIR}" - ) -endif() - # QtScriptByteArray add_library(QtScriptByteArray STATIC EXCLUDE_FROM_ALL lib/qtscript-bytearray/bytearrayclass.cpp -- cgit v1.2.3 From b0225017a98d24621de9e65c650646aeccebae8c Mon Sep 17 00:00:00 2001 From: Be Date: Thu, 4 Feb 2021 14:13:23 -0600 Subject: CMake: enable FFMPEG if it is found --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index e224dff8a5..7a0d4ad0fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2240,7 +2240,7 @@ endif() # FFmpeg 4.x support # FFmpeg is multimedia library that can be found http://ffmpeg.org/ find_package(FFMPEG COMPONENTS libavcodec libavformat libavutil libswresample) -option(FFMPEG "FFmpeg 4.x support" OFF) +cmake_dependent_option(FFMPEG "FFmpeg 4.x support" ON "FFMPEG_FOUND" OFF) if(FFMPEG) if(NOT FFMPEG_libavcodec_FOUND) message(FATAL_ERROR "FFmpeg support requires libavcodec and its development headers.") -- cgit v1.2.3 From daa876c4a1f5fd195bc5e2e2970ceaf40226d5df Mon Sep 17 00:00:00 2001 From: Be Date: Tue, 9 Feb 2021 01:15:59 -0600 Subject: factor out SemanticVersion into a utility class --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a0d4ad0fb..9f310304e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -815,6 +815,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/util/sample.cpp src/util/samplebuffer.cpp src/util/sandbox.cpp + src/util/semanticversion.cpp src/util/screensaver.cpp src/util/sleepableqthread.cpp src/util/stat.cpp -- cgit v1.2.3 From 1eab1d0a4cf89f22d3bb7f24e77cb92a18a62e0c Mon Sep 17 00:00:00 2001 From: Be Date: Tue, 9 Feb 2021 14:28:51 -0600 Subject: Encoder: fix build with OPUS=OFF --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f310304e1..84edfaf36b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -473,7 +473,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/encoder/encoderflacsettings.cpp src/encoder/encodermp3.cpp src/encoder/encodermp3settings.cpp - src/encoder/encoderopussettings.cpp src/encoder/encodersndfileflac.cpp src/encoder/encodervorbis.cpp src/encoder/encodervorbissettings.cpp @@ -2385,6 +2384,7 @@ if(OPUS) target_sources(mixxx-lib PRIVATE src/sources/soundsourceopus.cpp src/encoder/encoderopus.cpp + src/encoder/encoderopussettings.cpp ) target_compile_definitions(mixxx-lib PUBLIC __OPUS__) target_include_directories(mixxx-lib SYSTEM PUBLIC ${Opus_INCLUDE_DIRS}) -- cgit v1.2.3 From 18bc1e8042a63ccbbef102b9639ec4cc81152fac Mon Sep 17 00:00:00 2001 From: Be Date: Tue, 16 Feb 2021 15:02:41 -0600 Subject: CMake: disable FFMPEG automatically if it is too old --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 84edfaf36b..3b606c19d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2240,7 +2240,7 @@ endif() # FFmpeg 4.x support # FFmpeg is multimedia library that can be found http://ffmpeg.org/ find_package(FFMPEG COMPONENTS libavcodec libavformat libavutil libswresample) -cmake_dependent_option(FFMPEG "FFmpeg 4.x support" ON "FFMPEG_FOUND" OFF) +cmake_dependent_option(FFMPEG "FFmpeg 4.x support" ON "FFMPEG_FOUND;FFMPEG_libavcodec_VERSION VERSION_GREATER_EQUAL 58" OFF) if(FFMPEG) if(NOT FFMPEG_libavcodec_FOUND) message(FATAL_ERROR "FFmpeg support requires libavcodec and its development headers.") -- cgit v1.2.3 From 3133372e05a9f0f0293aaea59dadfc01e5eb0601 Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 17 Feb 2021 17:20:50 -0600 Subject: CMake: add comment why qt_de.dm is searched for --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b606c19d7..f1d12b9256 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1353,6 +1353,8 @@ if(MSVC) endif() if(WIN32) + # qt_de.qm is just one arbitrary file in the directory that needs to be located; + # there is no particular reason to look for this file versus any other one in the directory. find_file(QT_TRANSLATION_FILE qt_de.qm PATH_SUFFIXES share/qt5/translations) get_filename_component(QT_TRANSLATIONS ${QT_TRANSLATION_FILE} DIRECTORY) install( -- cgit v1.2.3