From cd534bbda73434613f89374392e1b96550a190f4 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 14 Oct 2023 03:30:09 +0200 Subject: [PATCH] CMake: Remove USE_BUNDLE_DIR --- CMakeLists.txt | 14 +++----------- src/config.h.in | 1 - 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7119854e2..8dea407f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -452,19 +452,11 @@ optional_component(EBUR128 ON "EBU R 128 loudness normalization" ) if(APPLE OR WIN32) - option(USE_BUNDLE "Bundle dependencies" ON) + set(USE_BUNDLE_DEFAULT ON) else() - option(USE_BUNDLE "Bundle dependencies" OFF) -endif() - -if(USE_BUNDLE AND NOT USE_BUNDLE_DIR) - if(LINUX) - set(USE_BUNDLE_DIR "../plugins") - endif() - if(APPLE) - set(USE_BUNDLE_DIR "../PlugIns") - endif() + set(USE_BUNDLE_DEFAULT OFF) endif() +option(USE_BUNDLE "Bundle dependencies" USE_BUNDLE_DEFAULT) if(NOT CMAKE_CROSSCOMPILING) # Check that we have Qt with sqlite driver diff --git a/src/config.h.in b/src/config.h.in index 77eb007d6..3be0c0f2a 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -41,7 +41,6 @@ #cmakedefine HAVE_TAGLIB_DSDIFFFILE #cmakedefine USE_BUNDLE -#define USE_BUNDLE_DIR "${USE_BUNDLE_DIR}" #cmakedefine HAVE_TRANSLATIONS #cmakedefine INSTALL_TRANSLATIONS