diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2021-02-23 23:55:24 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2021-02-24 00:52:11 +0100 |
| commit | 5155f3700582e405803adb13715accb0dfda3ccc (patch) | |
| tree | 10943dfaed4489db10f6d7b02a3132466221d85f | |
| parent | 757d575cf63fbf3502f16b6ad0819dfa77c8d747 (diff) | |
Lower CMake Version to 3.13. Don't install unused developer symlink of linfdk-aac.dylib
| -rw-r--r-- | CMakeLists.txt | 35 | ||||
| -rw-r--r-- | packaging/debian/control.in | 2 |
2 files changed, 19 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 19a332add5..966081763e 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.") @@ -2219,22 +2219,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 8687708df3..3de8b82de0 100644 --- a/packaging/debian/control.in +++ b/packaging/debian/control.in @@ -26,7 +26,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, |