dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Remove USE_BUNDLE_DIR

Browse Source
This commit is contained in:
Jonas Kvinge
2023-10-14 03:30:09 +02:00
parent 1a66eaf7bf
commit cd534bbda7
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@@ -452,19 +452,11 @@ optional_component(EBUR128 ON "EBU R 128 loudness normalization"
) )
if(APPLE OR WIN32) if(APPLE OR WIN32)
option(USE_BUNDLE "Bundle dependencies" ON) set(USE_BUNDLE_DEFAULT ON)
else() else()
option(USE_BUNDLE "Bundle dependencies" OFF) set(USE_BUNDLE_DEFAULT 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()
endif() endif()
option(USE_BUNDLE "Bundle dependencies" USE_BUNDLE_DEFAULT)
if(NOT CMAKE_CROSSCOMPILING) if(NOT CMAKE_CROSSCOMPILING)
# Check that we have Qt with sqlite driver # Check that we have Qt with sqlite driver

1
src/config.h.in
View File

@@ -41,7 +41,6 @@
#cmakedefine HAVE_TAGLIB_DSDIFFFILE #cmakedefine HAVE_TAGLIB_DSDIFFFILE
#cmakedefine USE_BUNDLE #cmakedefine USE_BUNDLE
#define USE_BUNDLE_DIR "${USE_BUNDLE_DIR}"
#cmakedefine HAVE_TRANSLATIONS #cmakedefine HAVE_TRANSLATIONS
#cmakedefine INSTALL_TRANSLATIONS #cmakedefine INSTALL_TRANSLATIONS