From 5155f3700582e405803adb13715accb0dfda3ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 23 Feb 2021 23:55:24 +0100 Subject: Lower CMake Version to 3.13. Don't install unused developer symlink of linfdk-aac.dylib --- CMakeLists.txt | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'CMakeLists.txt') 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 -- cgit v1.2.3