diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2021-02-24 14:23:56 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2021-02-24 14:23:56 +0100 |
| commit | a9ba525e847958aede16c628c67919fdfc51d25f (patch) | |
| tree | 446e27f472a6cfa809c9b16aaa5ad5ef8a7ba6a6 | |
| parent | 016a35203d3f8951457a08687540b608c5059121 (diff) | |
| parent | 9e155f4776a00a9fc642b366bf60a868ed67e677 (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 35 | ||||
| -rw-r--r-- | packaging/debian/control.in | 2 |
3 files changed, 20 insertions, 19 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68fdd794da..69b2b9e6b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -113,7 +113,7 @@ jobs: with: # This should always match the mininum required version in # our CMakeLists.txt - cmake-version: '3.15.x' + cmake-version: '3.13.x' - name: "[Windows] Install additional build tools" if: runner.os == 'Windows' diff --git a/CMakeLists.txt b/CMakeLists.txt index 655f947eb5..5ac1611f86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15.0) +cmake_minimum_required(VERSION 3.13.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.") @@ -2283,22 +2283,23 @@ 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") +if(APPLE AND MACOS_BUNDLE) + find_library(FDK_AAC_LIBRARY fdk-aac.2) + if(FDK_AAC_LIBRARY) + message(STATUS "Found fdk-aac: ${FDK_AAC_LIBRARY}") + install(FILES ${FDK_AAC_LIBRARY} DESTINATION ${MIXXX_INSTALL_PREFIX}/Contents/Frameworks) + else() + message(STATUS "Could NOT find libfdk-aac.2.dylib") + endif() +elseif(WIN32) + # 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(FDK_AAC_DLL) + message(STATUS "Found fdk-aac DLL: ${FDK_AAC_DLL}") + install(FILES ${FDK_AAC_DLL} DESTINATION ${MIXXX_INSTALL_BINDIR}) + else() + message(STATUS "Could NOT find fdk-aac.dll") + endif() endif() # FFmpeg 4.x support diff --git a/packaging/debian/control.in b/packaging/debian/control.in index a4f86a5eb1..0230b106ae 100644 --- a/packaging/debian/control.in +++ b/packaging/debian/control.in @@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 11), # Only needed for running tests that use SQLite. libqt5sql5-sqlite, libqt5x11extras5-dev, - cmake (>= 3.15), + cmake (>= 3.13), libjack-dev, portaudio19-dev, libid3tag0-dev, |