diff options
26 files changed, 585 insertions, 609 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fe626d873d..f3f71e3754 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -258,7 +258,6 @@ if(WIN32) # Add support for lib prefix on Windows set(CMAKE_FIND_LIBRARY_PREFIXES "" "lib") endif() -set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL") # Get the current working branch execute_process( @@ -1119,10 +1118,6 @@ elseif(UNIX) target_compile_definitions(mixxx-lib PUBLIC __APPLE__) else() target_compile_definitions(mixxx-lib PRIVATE __UNIX__) - # UNIX_SHARE_PATH must be set to the absolute path - # including the install prefix! - target_compile_definitions( - mixxx-lib PUBLIC UNIX_SHARE_PATH="${CMAKE_INSTALL_PREFIX}/${MIXXX_INSTALL_DATADIR}") if(CMAKE_SYSTEM_NAME STREQUAL Linux) target_compile_definitions(mixxx-lib PUBLIC __LINUX__) elseif(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$") @@ -1538,26 +1533,6 @@ set_target_properties(mixxx-qrc PROPERTIES AUTORCC ON) target_sources(mixxx PRIVATE $<TARGET_OBJECTS:mixxx-qrc>) target_sources(mixxx-test PRIVATE $<TARGET_OBJECTS:mixxx-qrc>) -if(UNIX AND USE_SYMLINKS) - add_custom_target(mixxx-res - COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/res" "${CMAKE_CURRENT_BINARY_DIR}/res" - COMMENT "Symlinking resources to build directory..." - ) -elseif(WIN32) - file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/res" CMAKE_CURRENT_SOURCE_RES_DIR_NATIVE) - file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/res/" CMAKE_CURRENT_BINARY_RES_DIR_NATIVE) - add_custom_target(mixxx-res - COMMAND xcopy ${CMAKE_CURRENT_SOURCE_RES_DIR_NATIVE} ${CMAKE_CURRENT_BINARY_RES_DIR_NATIVE} /s /d /q /y - COMMENT "Copying missing or modified resources files to build directory..." - ) -else() - add_custom_target(mixxx-res - COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/res" "${CMAKE_CURRENT_BINARY_DIR}/res" - COMMENT "Copying all resources files to build directory..." - ) -endif() -add_dependencies(mixxx-lib mixxx-res) - file(READ src/_version.h MIXXX_VERSION_FILECONTENT) string(REGEX REPLACE "^.*#define MIXXX_VERSION \"(.*)\".*$" "\\1" MIXXX_VERSION "${MIXXX_VERSION_FILECONTENT}") # a dummy configure to force a reconfigure when the version changes @@ -1732,13 +1707,12 @@ target_link_libraries(mixxx-lib PUBLIC fidlib) # KeyFinder find_package(KeyFinder) -# If KeyFinder is built statically, we need FFTW -find_package(FFTW) -cmake_dependent_option(KEYFINDER "KeyFinder support" ON "KeyFinder_FOUND OR FFTW_FOUND" OFF) +option(KEYFINDER "KeyFinder support" ON) if(KEYFINDER) if (KeyFinder_FOUND) target_link_libraries(mixxx-lib PUBLIC KeyFinder::KeyFinder) else() + # If KeyFinder is built statically, we need FFTW find_package(FFTW REQUIRED) set(KeyFinder_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/lib/keyfinder-install") set(KeyFinder_LIBRARY "lib/${CMAKE_STATIC_LIBRARY_PREFIX}keyfinder${CMAKE_STATIC_LIBRARY_SUFFIX}") @@ -1803,8 +1777,8 @@ target_link_libraries(mixxx-lib PUBLIC FpClassify) target_include_directories(mixxx-lib SYSTEM PUBLIC "${gtest_SOURCE_DIR}/include") # LAME -find_package(LAME REQUIRED) -target_link_libraries(mixxx-lib PUBLIC LAME::LAME) +find_package(mp3lame REQUIRED) +target_link_libraries(mixxx-lib PUBLIC mp3lame::mp3lame) # Kaitai for reading Rekordbox libraries add_library(Kaitai STATIC EXCLUDE_FROM_ALL @@ -2094,19 +2068,17 @@ target_include_directories(mixxx-lib SYSTEM PRIVATE lib/reverb) target_link_libraries(mixxx-lib PUBLIC Reverb) # Rubberband -find_package(Rubberband REQUIRED) -target_link_libraries(mixxx-lib PUBLIC Rubberband::Rubberband) +find_package(rubberband REQUIRED) +target_link_libraries(mixxx-lib PUBLIC rubberband::rubberband) # SndFile find_package(SndFile REQUIRED) -target_link_libraries(mixxx-lib PUBLIC SndFile::SndFile) +target_link_libraries(mixxx-lib PUBLIC SndFile::sndfile) target_compile_definitions(mixxx-lib PUBLIC __SNDFILE__) if(SndFile_SUPPORTS_SET_COMPRESSION_LEVEL) target_compile_definitions(mixxx-lib PUBLIC SFC_SUPPORTS_SET_COMPRESSION_LEVEL) endif() - -#libsndfile is always build statically, so we don't check for STATIC_DEPS -if(WIN32) +if(WIN32 AND STATIC_DEPS) find_package(G72X REQUIRED) target_link_libraries(mixxx-lib PUBLIC G72X::G72X) endif() @@ -2288,27 +2260,27 @@ endif() # FFmpeg 4.x support # FFmpeg is multimedia library that can be found http://ffmpeg.org/ -find_package(FFmpeg COMPONENTS AVCODEC AVFORMAT AVUTIL SWRESAMPLE) +find_package(FFMPEG COMPONENTS libavcodec libavformat libavutil libswresample) option(FFMPEG "FFmpeg 4.x support" OFF) if(FFMPEG) - if(NOT AVCODEC_FOUND) + if(NOT FFMPEG_libavcodec_FOUND) message(FATAL_ERROR "FFmpeg support requires libavcodec and its development headers.") - elseif(AVCODEC_VERSION VERSION_LESS 58) + elseif(FFMPEG_libavcodec_VERSION VERSION_LESS 58) message(FATAL_ERROR "FFmpeg support requires at least version 58 of libavcodec (found: ${AVCODEC_VERSION}).") endif() - if(NOT AVFORMAT_FOUND) + if(NOT FFMPEG_libavformat_FOUND) message(FATAL_ERROR "FFmpeg support requires libavformat and its development headers.") - elseif(AVFORMAT_VERSION VERSION_LESS 58) + elseif(FFMPEG_libavformat_VERSION VERSION_LESS 58) message(FATAL_ERROR "FFmpeg support requires at least version 58 of libavformat (found: ${AVFORMAT_VERSION}).") endif() - if(NOT AVUTIL_FOUND) + if(NOT FFMPEG_libavutil_FOUND) message(FATAL_ERROR "FFmpeg support requires libavutil and its development headers.") - elseif(AVUTIL_VERSION VERSION_LESS 56) + elseif(FFMPEG_libavutil_VERSION VERSION_LESS 56) message(FATAL_ERROR "FFmpeg support requires at least version 56 of libavutil (found: ${AVUTIL_VERSION}).") endif() - if(NOT SWRESAMPLE_FOUND) + if(NOT FFMPEG_libswresample_FOUND) message(FATAL_ERROR "FFmpeg support requires libswresample and its development headers.") - elseif(SWRESAMPLE_VERSION VERSION_LESS 3.1) + elseif(FFMPEG_libswresample_VERSION VERSION_LESS 3.1) message(FATAL_ERROR "FFmpeg support requires at least version 3.1 of libswresample (found: ${SWRESAMPLE_VERSION}).") endif() @@ -2320,12 +2292,9 @@ if(FFMPEG) __STDC_LIMIT_MACROS __STDC_FORMAT_MACROS ) - target_link_libraries(mixxx-lib PUBLIC - FFmpeg::avcodec - FFmpeg::avformat - FFmpeg::avutil - FFmpeg::swresample - ) + + target_link_libraries(mixxx-lib PUBLIC "${FFMPEG_LIBRARIES}") + target_include_directories(mixxx-lib PUBLIC "${FFMPEG_INCLUDE_DIRS}") endif() # Google PerfTools @@ -2359,10 +2328,10 @@ if(HSS1394) endif() # Lilv (LV2) -find_package(Lilv) -cmake_dependent_option(LILV "Lilv (LV2) support" ON "Lilv_FOUND" OFF) +find_package(lilv) +cmake_dependent_option(LILV "Lilv (LV2) support" ON "lilv_FOUND" OFF) if(LILV) - if(NOT Lilv_FOUND) + if(NOT TARGET lilv::lilv) message(FATAL_ERROR "Lilv (LV2) support requires the liblilv-0 and its development headers.") endif() target_sources(mixxx-lib PRIVATE @@ -2372,7 +2341,7 @@ if(LILV) src/preferences/dialog/dlgpreflv2.cpp ) target_compile_definitions(mixxx-lib PUBLIC __LILV__) - target_link_libraries(mixxx-lib PUBLIC Lilv::Lilv) + target_link_libraries(mixxx-lib PUBLIC lilv::lilv) endif() # Live Broadcasting (Shoutcast) @@ -2447,8 +2416,7 @@ if(OPUS) target_compile_definitions(mixxx-lib PUBLIC __OPUS__) target_include_directories(mixxx-lib SYSTEM PUBLIC ${Opus_INCLUDE_DIRS}) target_link_libraries(mixxx-lib PUBLIC ${Opus_LIBRARIES}) - # Opus is always built statically so we don't check STATIC_DEPS - if(WIN32) + if(WIN32 AND STATIC_DEPS) find_package(Celt) if(NOT Celt_FOUND) message(FATAL_ERROR "Opus support with static dependencies requires the celt library.") @@ -2548,12 +2516,12 @@ if(HID) target_include_directories(mixxx-hidapi SYSTEM PUBLIC lib/hidapi/hidapi) if(WIN32) target_sources(mixxx-hidapi PRIVATE lib/hidapi/windows/hid.c) + find_library(Setupapi_LIBRARY Setupapi REQUIRED) + target_link_libraries(mixxx-hidapi PUBLIC ${Setupapi_LIBRARY}) elseif(APPLE) target_sources(mixxx-hidapi PRIVATE lib/hidapi/mac/hid.c) - find_library(APPKIT_LIBRARY AppKit REQUIRED) - target_link_libraries(mixxx-lib PUBLIC - ${APPKIT_LIBRARY} - ) + find_library(AppKit_LIBRARY AppKit REQUIRED) + target_link_libraries(mixxx-hidapi PUBLIC ${AppKit_LIBRARY}) elseif(UNIX) if(NOT LibUSB_FOUND) message(FATAL_ERROR "USB HID controller support on Unix with statically linked libhidapi-libusb requires libusb 1.0 and its development headers.") @@ -2624,15 +2592,15 @@ if(VINYLCONTROL) endif() # WavPack audio file support -find_package(WavPack) +find_package(wavpack) option(WAVPACK "WavPack audio file support" OFF) if(WAVPACK) - if(NOT WavPack_FOUND) + if(NOT TARGET WavPack::wavpack) message(FATAL_ERROR "WavPack audio file support requires libwv and its development headers.") endif() target_sources(mixxx-lib PRIVATE src/sources/soundsourcewv.cpp) target_compile_definitions(mixxx-lib PUBLIC __WV__) - target_link_libraries(mixxx-lib PUBLIC WavPack::WavPack) + target_link_libraries(mixxx-lib PUBLIC WavPack::wavpack) endif() # Packaging diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake new file mode 100644 index 0000000000..cd1ebe34c8 --- /dev/null +++ b/cmake/modules/FindFFMPEG.cmake @@ -0,0 +1,166 @@ +#.rst: +# FindFFMPEG +# ---------- +# +# Try to find the required ffmpeg components (default: libavformat, libavutil, libavcodec) +# +# Next variables can be used to hint FFMPEG libs search: +# +# :: +# +# PC_<component>_LIBRARY_DIRS +# PC_FFMPEG_LIBRARY_DIRS +# PC_<component>_INCLUDE_DIRS +# PC_FFMPEG_INCLUDE_DIRS +# +# Once done this will define +# +# :: +# +# FFMPEG_FOUND - System has the all required components. +# FFMPEG_INCLUDE_DIRS - Include directory necessary for using the required components headers. +# FFMPEG_LIBRARIES - Link these to use the required ffmpeg components. +# FFMPEG_DEFINITIONS - Compiler switches required for using the required ffmpeg components. +# +# For each of the components it will additionally set. +# +# :: +# +# libavcodec +# libavdevice +# libavformat +# libavfilter +# libavutil +# libpostproc +# libswscale +# +# the following variables will be defined +# +# :: +# +# <component>_FOUND - System has <component> +# <component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers +# <component>_LIBRARIES - Link these to use <component> +# <component>_DEFINITIONS - Compiler switches required for using <component> +# <component>_VERSION - The components version +# +# the following import targets is created +# +# :: +# +# FFMPEG::FFMPEG - for all components +# FFMPEG::<component> - where <component> in lower case (FFMPEG::avcodec) for each components +# +# Copyright (c) 2006, Matthias Kretz, <kretz@kde.org> +# Copyright (c) 2008, Alexander Neundorf, <neundorf@kde.org> +# Copyright (c) 2011, Michael Jansen, <kde@michael-jansen.biz> +# Copyright (c) 2017, Alexander Drozdov, <adrozdoff@gmail.com> +# Copyright (c) 2019, Jan Holthuis, <holthuis.jan@googlemail.com> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +include(FindPackageHandleStandardArgs) + +# The default components were taken from a survey over other FindFFMPEG.cmake files +if (NOT FFMPEG_FIND_COMPONENTS) + set(FFMPEG_FIND_COMPONENTS libavcodec libavformat libavutil) +endif () + +# +### Macro: find_component +# +# Checks for the given component by invoking pkgconfig and then looking up the libraries and +# include directories. +# +macro(find_component _component _pkgconfig _library _header) + + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + find_package(PkgConfig QUIET) + if (PkgConfig_FOUND) + pkg_check_modules(PC_FFMPEG_${_component} QUIET ${_pkgconfig}) + endif () + + find_path(FFMPEG_${_component}_INCLUDE_DIRS ${_header} + HINTS + ${PC_FFMPEG_${_component}_INCLUDEDIR} + ${PC_FFMPEG_${_component}_INCLUDE_DIRS} + ${PC_FFMPEG_INCLUDE_DIRS} + PATH_SUFFIXES + ffmpeg + ) + + find_library(FFMPEG_${_component}_LIBRARIES NAMES ${PC_FFMPEG_${_component}_LIBRARIES} ${_library} + HINTS + ${PC_FFMPEG_${_component}_LIBDIR} + ${PC_FFMPEG_${_component}_LIBRARY_DIRS} + ${PC_FFMPEG_LIBRARY_DIRS} + ) + + #message(STATUS ${FFMPEG_${_component}_LIBRARIES}) + #message(STATUS ${PC_FFMPEG_${_component}_LIBRARIES}) + + set(FFMPEG_${_component}_DEFINITIONS ${PC_FFMPEG_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.") + set(FFMPEG_${_component}_VERSION ${PC_FFMPEG_${_component}_VERSION} CACHE STRING "The ${_component} version number.") + + if (FFMPEG_${_component}_LIBRARIES AND FFMPEG_${_component}_INCLUDE_DIRS) + # message(STATUS " - ${_component} found.") + set(FFMPEG_${_component}_FOUND TRUE) + else () + # message(STATUS " - ${_component} not found.") + endif () + + mark_as_advanced( + FFMPEG_${_component}_INCLUDE_DIRS + FFMPEG_${_component}_LIBRARIES + FFMPEG_${_component}_DEFINITIONS + FFMPEG_${_component}_VERSION) + +endmacro() + + +# Check for all possible component. +find_component(libavcodec libavcodec avcodec libavcodec/avcodec.h) +find_component(libavformat libavformat avformat libavformat/avformat.h) +find_component(libavdevice libavdevice avdevice libavdevice/avdevice.h) +find_component(libavutil libavutil avutil libavutil/avutil.h) +find_component(libavfilter libavfilter avfilter libavfilter/avfilter.h) +find_component(libswscale libswscale swscale libswscale/swscale.h) +find_component(libpostproc libpostproc postproc libpostproc/postprocess.h) +find_component(libswresample libswresample swresample libswresample/swresample.h) + +set(FFMPEG_LIBRARIES "") +set(FFMPEG_DEFINITIONS "") +# Check if the required components were found and add their stuff to the FFMPEG_* vars. +foreach (_component ${FFMPEG_FIND_COMPONENTS}) + if (FFMPEG_${_component}_FOUND) + #message(STATUS "Required component ${_component} present.") + set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${FFMPEG_${_component}_LIBRARIES}) + set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${FFMPEG_${_component}_DEFINITIONS}) + list(APPEND FFMPEG_INCLUDE_DIRS ${FFMPEG_${_component}_INCLUDE_DIRS}) + endif() +endforeach () + +# Build the include path with duplicates removed. +if (FFMPEG_INCLUDE_DIRS) + list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS) +endif () + +# cache the vars. +set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} CACHE STRING "The FFMPEG include directories." FORCE) +set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} CACHE STRING "The FFMPEG libraries." FORCE) +set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} CACHE STRING "The FFMPEG cflags." FORCE) + +mark_as_advanced(FFMPEG_INCLUDE_DIRS + FFMPEG_LIBRARIES + FFMPEG_DEFINITIONS) + +# Compile the list of required vars +set(_FFMPEG_REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS) +foreach (_component ${FFMPEG_FIND_COMPONENTS}) + list(APPEND _FFMPEG_REQUIRED_VARS FFMPEG_${_component}_LIBRARIES FFMPEG_${_component}_INCLUDE_DIRS) +endforeach () + +# Give a nice error message if some of the required vars are missing. +find_package_handle_standard_args(FFMPEG DEFAULT_MSG ${_FFMPEG_REQUIRED_VARS}) diff --git a/cmake/modules/FindFFmpeg.cmake b/cmake/modules/FindFFmpeg.cmake deleted file mode 100644 index 2126aed73e..0000000000 --- a/cmake/modules/FindFFmpeg.cmake +++ /dev/null @@ -1,186 +0,0 @@ -#.rst: -# FindFFmpeg -# ---------- -# -# Try to find the required ffmpeg components (default: AVFORMAT, AVUTIL, AVCODEC) -# -# Next variables can be used to hint FFmpeg libs search: -# -# :: -# -# PC_<component>_LIBRARY_DIRS -# PC_FFMPEG_LIBRARY_DIRS -# PC_<component>_INCLUDE_DIRS -# PC_FFMPEG_INCLUDE_DIRS -# -# Once done this will define -# -# :: -# -# FFMPEG_FOUND - System has the all required components. -# FFMPEG_INCLUDE_DIRS - Include directory necessary for using the required components headers. -# FFMPEG_LIBRARIES - Link these to use the required ffmpeg components. -# FFMPEG_DEFINITIONS - Compiler switches required for using the required ffmpeg components. -# -# For each of the components it will additionally set. -# -# :: -# -# AVCODEC -# AVDEVICE -# AVFORMAT -# AVFILTER -# AVUTIL -# POSTPROC -# SWSCALE -# -# the following variables will be defined -# -# :: -# -# <component>_FOUND - System has <component> -# <component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers -# <component>_LIBRARIES - Link these to use <component> -# <component>_DEFINITIONS - Compiler switches required for using <component> -# <component>_VERSION - The components version -# -# the following import targets is created -# -# :: -# -# FFmpeg::FFmpeg - for all components -# FFmpeg::<component> - where <component> in lower case (FFmpeg::avcodec) for each components -# -# Copyright (c) 2006, Matthias Kretz, <kretz@kde.org> -# Copyright (c) 2008, Alexander Neundorf, <neundorf@kde.org> -# Copyright (c) 2011, Michael Jansen, <kde@michael-jansen.biz> -# Copyright (c) 2017, Alexander Drozdov, <adrozdoff@gmail.com> -# Copyright (c) 2019, Jan Holthuis, <holthuis.jan@googlemail.com> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -include(FindPackageHandleStandardArgs) - -# The default components were taken from a survey over other FindFFMPEG.cmake files -if (NOT FFmpeg_FIND_COMPONENTS) - set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL) -endif () - -# -### Macro: find_component -# -# Checks for the given component by invoking pkgconfig and then looking up the libraries and -# include directories. -# -macro(find_component _component _pkgconfig _library _header) - - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - find_package(PkgConfig QUIET) - if (PkgConfig_FOUND) - pkg_check_modules(PC_${_component} QUIET ${_pkgconfig}) - endif () - - find_path(${_component}_INCLUDE_DIRS ${_header} - HINTS - ${PC_${_component}_INCLUDEDIR} - ${PC_${_component}_INCLUDE_DIRS} - ${PC_FFMPEG_INCLUDE_DIRS} - PATH_SUFFIXES - ffmpeg - ) - - find_library(${_component}_LIBRARIES NAMES ${PC_${_component}_LIBRARIES} ${_library} - HINTS - ${PC_${_component}_LIBDIR} - ${PC_${_component}_LIBRARY_DIRS} - ${PC_FFMPEG_LIBRARY_DIRS} - ) - - #message(STATUS ${${_component}_LIBRARIES}) - #message(STATUS ${PC_${_component}_LIBRARIES}) - - set(${_component}_DEFINITIONS ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.") - set(${_component}_VERSION ${PC_${_component}_VERSION} CACHE STRING "The ${_component} version number.") - - if (${_component}_LIBRARIES AND ${_component}_INCLUDE_DIRS) - # message(STATUS " - ${_component} found.") - set(${_component}_FOUND TRUE) - else () - # message(STATUS " - ${_component} not found.") - endif () - - mark_as_advanced( - ${_component}_INCLUDE_DIRS - ${_component}_LIBRARIES - ${_component}_DEFINITIONS - ${_component}_VERSION) - -endmacro() - - -# Check for all possible component. -find_component(AVCODEC libavcodec avcodec libavcodec/avcodec.h) -find_component(AVFORMAT libavformat avformat libavformat/avformat.h) -find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h) -find_component(AVUTIL libavutil avutil libavutil/avutil.h) -find_component(AVFILTER libavfilter avfilter libavfilter/avfilter.h) -find_component(SWSCALE libswscale swscale libswscale/swscale.h) -find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h) -find_component(SWRESAMPLE libswresample swresample libswresample/swresample.h) - -set(FFMPEG_LIBRARIES "") -set(FFMPEG_DEFINITIONS "") -# Check if the required components were found and add their stuff to the FFMPEG_* vars. -foreach (_component ${FFmpeg_FIND_COMPONENTS}) - if (${_component}_FOUND) - # message(STATUS "Required component ${_component} present.") - set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${${_component}_LIBRARIES}) - set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${_component}_DEFINITIONS}) - list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIRS}) - - string(TOLOWER ${_component} _lowerComponent) - if (NOT TARGET FFmpeg::${_lowerComponent}) - add_library(FFmpeg::${_lowerComponent} INTERFACE IMPORTED) - set_target_properties(FFmpeg::${_lowerComponent} PROPERTIES - INTERFACE_COMPILE_OPTIONS "${${_component}_DEFINITIONS}" - INTERFACE_INCLUDE_DIRECTORIES ${${_component}_INCLUDE_DIRS} - INTERFACE_LINK_LIBRARIES "${${_component}_LIBRARIES}") - endif() - - else () - # message(STATUS "Required component ${_component} missing.") - endif () -endforeach () - -# Build the include path with duplicates removed. -if (FFMPEG_INCLUDE_DIRS) - list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS) -endif () - -# cache the vars. -set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} CACHE STRING "The FFmpeg include directories." FORCE) -set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} CACHE STRING "The FFmpeg libraries." FORCE) -set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} CACHE STRING "The FFmpeg cflags." FORCE) - -mark_as_advanced(FFMPEG_INCLUDE_DIRS - FFMPEG_LIBRARIES - FFMPEG_DEFINITIONS) - -if (NOT TARGET FFmpeg::FFmpeg) - add_library(FFmpeg::FFmpeg INTERFACE IMPORTED) - set_target_properties(FFmpeg::FFmpeg PROPERTIES - INTERFACE_COMPILE_OPTIONS "${FFMPEG_DEFINITIONS}" - INTERFACE_INCLUDE_DIRECTORIES "${FFMPEG_INCLUDE_DIRS}" - INTERFACE_LINK_LIBRARIES "${FFMPEG_LIBRARIES}") -endif() - -# Compile the list of required vars -set(_FFmpeg_REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS) -foreach (_component ${FFmpeg_FIND_COMPONENTS}) - list(APPEND _FFmpeg_REQUIRED_VARS ${_component}_LIBRARIES ${_component}_INCLUDE_DIRS) -endforeach () - -# Give a nice error message if some of the required vars are missing. -find_package_handle_standard_args(FFmpeg DEFAULT_MSG ${_FFmpeg_REQUIRED_VARS}) diff --git a/cmake/modules/FindHIDAPI.cmake b/cmake/modules/FindHIDAPI.cmake index 7f2f2fa6ed..699fd31670 100644 --- a/cmake/modules/FindHIDAPI.cmake +++ b/cmake/modules/FindHIDAPI.cmake @@ -56,7 +56,7 @@ find_path(HIDAPI_INCLUDE_DIR mark_as_advanced(HIDAPI_INCLUDE_DIR) find_library(HIDAPI_LIBRARY - NAMES hidapi-libusb + NAMES hidapi-libusb hidapi PATHS ${PC_HIDAPI_LIBRARY_DIRS} DOC "HIDAPI library" ) diff --git a/cmake/modules/FindLilv.cmake b/cmake/modules/FindLilv.cmake deleted file mode 100644 index f89d2b0580..0000000000 --- a/cmake/modules/FindLilv.cmake +++ /dev/null @@ -1,87 +0,0 @@ -# This file is part of Mixxx, Digital DJ'ing software. -# Copyright (C) 2001-2020 Mixxx Development Team -# Distributed under the GNU General Public Licence (GPL) version 2 or any later -# later version. See the LICENSE file for details. - -#[=======================================================================[.rst: -FindLilv --------- - -Finds the Lilv library. - -Imported Targets -^^^^^^^^^^^^^^^^ - -This module provides the following imported targets, if found: - -``Lilv::Lilv`` - The Lilv library - -Result Variables -^^^^^^^^^^^^^^^^ - -This will define the following variables: - -``Lilv_FOUND`` - True if the system has the Lilv library. -``Lilv_INCLUDE_DIRS`` - Include directories needed to use Lilv. -``Lilv_LIBRARIES`` - Libraries needed to link to Lilv. -``Lilv_DEFINITIONS`` - Compile definitions needed to use Lilv. - -Cache Variables -^^^^^^^^^^^^^^^ - -The following cache variables may also be set: - -``Lilv_INCLUDE_DIR`` - The directory containing ``lilv-0/lilb/lilv.h``. -``Lilv_LIBRARY`` - The path to the Lilv library. - -#]=======================================================================] - -find_package(PkgConfig QUIET) -if(PkgConfig_FOUND) - pkg_check_modules(PC_Lilv QUIET lilv-0) -endif() - -find_path(Lilv_INCLUDE_DIR - NAMES lilv-0/lilv/lilv.h - PATHS ${PC_Lilv_INCLUDE_DIRS} - DOC "Lilv include directory" -) -mark_as_advanced(Lilv_INCLUDE_DIR) - -find_library(Lilv_LIBRARY - NAMES lilv-0 - PATHS ${PC_Lilv_LIBRARY_DIRS} - DOC "Lilv library" -) -mark_as_advanced(Lilv_LIBRARY) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args( - Lilv - DEFAULT_MSG - Lilv_LIBRARY - Lilv_INCLUDE_DIR -) - -if(Lilv_FOUND) - set(Lilv_LIBRARIES "${Lilv_LIBRARY}") - set(Lilv_INCLUDE_DIRS "${Lilv_INCLUDE_DIR}") - set(Lilv_DEFINITIONS ${PC_Lilv_CFLAGS_OTHER}) - - if(NOT TARGET Lilv::Lilv) - add_library(Lilv::Lilv UNKNOWN IMPORTED) - set_target_properties(Lilv::Lilv - PROPERTIES - IMPORTED_LOCATION "${Lilv_LIBRARY}" - INTERFACE_COMPILE_OPTIONS "${PC_Lilv_CFLAGS_OTHER}" - INTERFACE_INCLUDE_DIRECTORIES "${Lilv_INCLUDE_DIR}" - ) - endif() -endif() diff --git a/cmake/modules/FindRubberband.cmake b/cmake/modules/FindRubberband.cmake deleted file mode 100644 index 4f4046ea62..0000000000 --- a/cmake/modules/FindRubberband.cmake +++ /dev/null @@ -1,86 +0,0 @@ -# This file is part of Mixxx, Digital DJ'ing software. -# Copyright (C) 2001-2020 Mixxx Development Team -# Distributed under the GNU General Public Licence (GPL) version 2 or any later -# later version. See the LICENSE file for details. - -#[=======================================================================[.rst: -FindRubberband --------------- - -Finds the Rubberband library. - -Imported Targets -^^^^^^^^^^^^^^^^ - -This module provides the following imported targets, if found: - -``Rubberband::Rubberband`` - The Rubberband library - -Result Variables -^^^^^^^^^^^^^^^^ - -This will define the following variables: - -``Rubberband_FOUND`` - True if the system has the Rubberband library. -``Rubberband_INCLUDE_DIRS`` - Include directories needed to use Rubberband. -``Rubberband_LIBRARIES`` - Libraries needed to link to Rubberband. -``Rubberband_DEFINITIONS`` - Compile definitions needed to use Rubberband. - -Cache Variables -^^^^^^^^^^^^^^^ - -The following cache variables may also be set: - -``Rubberband_INCLUDE_DIR`` - The directory containing ``rubberband/RubberBandStretcher.h``. -``Rubberband_LIBRARY`` - The path to the Rubberband library. - -#]=======================================================================] - -find_package(PkgConfig QUIET) -if(PkgConfig_FOUND) - pkg_check_modules(PC_Rubberband QUIET rubberband) -endif() - -find_path(Rubberband_INCLUDE_DIR - NAMES rubberband/RubberBandStretcher.h - PATHS ${PC_Rubberband_INCLUDE_DIRS} - DOC "Rubberband include directory") -mark_as_advanced(Rubberband_INCLUDE_DIR) - -find_library(Rubberband_LIBRARY - NAMES rubberband - PATHS ${PC_Rubberband_LIBRARY_DIRS} - DOC "Rubberband library" -) -mark_as_advanced(Rubberband_LIBRARY) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args( - Rubberband - DEFAULT_MSG - Rubberband_LIBRARY - Rubberband_INCLUDE_DIR -) - -if(Rubberband_FOUND) - set(Rubberband_LIBRARIES "${Rubberband_LIBRARY}") - set(Rubberband_INCLUDE_DIRS "${Rubberband_INCLUDE_DIR}") - set(Rubberband_DEFINITIONS ${PC_Rubberband_CFLAGS_OTHER}) - - if(NOT TARGET Rubberband::Rubberband) - add_library(Rubberband::Rubberband UNKNOWN IMPORTED) - set_target_properties(Rubberband::Rubberband - PROPERTIES - IMPORTED_LOCATION "${Rubberband_LIBRARY}" - INTERFACE_COMPILE_OPTIONS "${PC_Rubberband_CFLAGS_OTHER}" - INTERFACE_INCLUDE_DIRECTORIES "${Rubberband_INCLUDE_DIR}" - ) - endif() -endif() diff --git a/cmake/modules/FindSndFile.cmake b/cmake/modules/FindSndFile.cmake index 42a951e141..b8ab75b8af 100644 --- a/cmake/modules/FindSndFile.cmake +++ b/cmake/modules/FindSndFile.cmake @@ -83,9 +83,9 @@ if(SndFile_FOUND) set(SndFile_INCLUDE_DIRS "${SndFile_INCLUDE_DIR}") set(SndFile_DEFINITIONS ${PC_SndFile_CFLAGS_OTHER}) - if(NOT TARGET SndFile::SndFile) - add_library(SndFile::SndFile UNKNOWN IMPORTED) - set_target_properties(SndFile::SndFile + if(NOT TARGET SndFile::sndfile) + add_library(SndFile::sndfile UNKNOWN IMPORTED) + set_target_properties(SndFile::sndfile PROPERTIES IMPORTED_LOCATION "${SndFile_LIBRARY}" INTERFACE_COMPILE_OPTIONS "${PC_SndFile_CFLAGS_OTHER}" diff --git a/cmake/modules/FindWavPack.cmake b/cmake/modules/FindWavPack.cmake deleted file mode 100644 index 3890df0ba2..0000000000 --- a/cmake/modules/FindWavPack.cmake +++ /dev/null @@ -1,86 +0,0 @@ -# This file is part of Mixxx, Digital DJ'ing software. -# Copyright (C) 2001-2020 Mixxx Development Team -# Distributed under the GNU General Public Licence (GPL) version 2 or any later -# later version. See the LICENSE file for details. - -#[=======================================================================[.rst: -FindWavPack ------------ - -Finds the WavPack library. - -Imported Targets -^^^^^^^^^^^^^^^^ - -This module provides the following imported targets, if found: - -``WavPack::WavPack`` - The WavPack library - -Result Variables -^^^^^^^^^^^^^^^^ - -This will define the following variables: - -``WavPack_FOUND`` - True if the system has the WavPack library. -``WavPack_INCLUDE_DIRS`` - Include directories needed to use WavPack. -``WavPack_LIBRARIES`` - Libraries needed to link to WavPack. -``WavPack_DEFINITIONS`` - Compile definitions needed to use WavPack. - -Cache Variables -^^^^^^^^^^^^^^^ - -The following cache variables may also be set: - -``WavPack_INCLUDE_DIR`` - The directory containing ``wavpack/wavpack.h``. -``WavPack_LIBRARY`` - The path to the Wav |