Fix build with FFmpeg 7, C++17, and external libresample and kissfft

.travis.yml

@@ -19,7 +19,7 @@ matrix:
 script:
     - mkdir -p build
     - cd build
-    - cmake -DBUILD_TEST=ON ..
+    - cmake ..
     - make -j
     - ctest -V
 
@@ -31,3 +31,5 @@ addons:
             - libavcodec-dev
             - libavformat-dev
             - libavutil-dev
+            - libresample-dev
+            - libkissfft-dev

CMakeLists.txt

@@ -4,9 +4,11 @@
 # (c) 2013-2014, Dominik Schnitzer <[email protected]>
 #          2014, Jan Schlueter <[email protected]>
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.17)
 
 project(musly)
+include(GNUInstallDirs)
+include(CTest)
 set(MUSLY_VERSION "0.2")
 add_definitions(-DMUSLY_VERSION="${MUSLY_VERSION}")
 
@@ -36,8 +38,6 @@ else ()
     set(BUILD_SHARED_LIBS ON)
 endif ()
 
-option(BUILD_TEST "Build selftest executable" OFF)
-
 option(USE_OPENMP "Compile with OpenMP support (Parallelization)" OFF)
 if (USE_OPENMP)
     find_package(OpenMP)
@@ -54,26 +54,35 @@ if (USE_OPENMP)
     endif()
 endif ()
 
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-
-find_package(Eigen3 REQUIRED)
-find_package(LibAV 0.8 COMPONENTS avcodec avformat avutil REQUIRED)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(EIGEN3 REQUIRED IMPORTED_TARGET eigen3)
+pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET
+    libavcodec
+    libavformat
+    libavutil)
+pkg_check_modules(LIBRESAMPLE REQUIRED IMPORTED_TARGET libresample)
+pkg_search_module(KISSFFT REQUIRED IMPORTED_TARGET
+    kissfft-simd
+    kissfft-double
+    kissfft-float
+    kissfft-int32_t
+    kissfft-int16_t
+    kissfft-simd-openmp
+    kissfft-double-openmp
+    kissfft-float-openmp
+    kissfft-int32_t-openmp
+    kissfft-int16_t-openmp)
 
 include_directories(
-    "${PROJECT_BINARY_DIR}"
     "${PROJECT_SOURCE_DIR}/include")
 
 add_subdirectory(libmusly) 
 add_subdirectory(musly) 
 add_subdirectory(include) 
-if (BUILD_TEST)
-    enable_testing()
+if (BUILD_TESTING)
     add_subdirectory(test)
 endif ()
 
 # Documentation
 set(musly_DOC_FILES AUTHORS COPYING README.md)
-set(musly_DOC_PATH "share/doc/musly")
-install(FILES ${musly_DOC_FILES}
-        DESTINATION ${musly_DOC_PATH})
-
+install(FILES ${musly_DOC_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR})

libmusly/CMakeLists.txt

@@ -4,9 +4,6 @@
 # (c) 2013-2014, Dominik Schnitzer <[email protected]>
 #     2014-2016, Jan Schlueter <[email protected]>
 
-add_subdirectory(
-    libresample)
-
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external")
     add_subdirectory(
         external)
@@ -16,26 +13,11 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external")
         PROPERTIES COMPILE_FLAGS "-DLIBMUSLY_EXTERNAL ${LIBMUSLY_EXTERNAL_FLAGS}")
 endif()
 
-if(EXISTS "${LIBAV_INCLUDE_DIRS}/libavutil/channel_layout.h")
-    set_source_files_properties(decoders/libav.cpp
-        PROPERTIES COMPILE_FLAGS "-DHAVE_AVUTIL_CHANNEL_LAYOUT")
-endif()
-
-if(USE_OPENMP AND OPENMP_FOUND)
-    # disable OpenMP for kiss FFT, it slows things down terribly
-    set_source_files_properties(kissfft/kiss_fft.c
-        PROPERTIES COMPILE_FLAGS "-U_OPENMP")
-endif()
-
 include_directories(
     ${LIBMUSLY_INCLUDE}
-    ${EIGEN3_INCLUDE_DIR}
-    ${LIBAV_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_library(libmusly
-    kissfft/kiss_fft.c
-    kissfft/kiss_fftr.c
     methods/mandelellis.cpp
     methods/timbre.cpp
     decoders/libav.cpp
@@ -65,7 +47,10 @@ set_target_properties(libmusly
 
 target_link_libraries(libmusly
     ${LIBMUSLY_LIBS}
-    ${LIBAV_LIBRARIES})
+    PkgConfig::EIGEN3
+    PkgConfig::FFMPEG
+    PkgConfig::LIBRESAMPLE
+    PkgConfig::KISSFFT)
 if(WIN32 OR MINGW)
     # link against winsock2 for ntohl() and htonl()
     target_link_libraries(libmusly ws2_32)
@@ -74,5 +59,4 @@ endif()
 set_target_properties(libmusly
     PROPERTIES PREFIX "")
 
-install(TARGETS libmusly
-    DESTINATION lib)
+install(TARGETS libmusly)