do not alter macOS bundle during packaging
thanks emberdex (https://github.com/tildearrow/furnace/pull/1609#issuecomment-2057085220) NOTE: if building for installation in /usr/local or something, be sure to pass -DFORCE_APPLE_BIN=ON to CMake!
This commit is contained in:
parent
3a1e286293
commit
fb36e5d8d7
5
.github/workflows/build.yml
vendored
5
.github/workflows/build.yml
vendored
|
@ -261,11 +261,6 @@ jobs:
|
|||
rmdir orig
|
||||
rm Furnace-*-Darwin.dmg
|
||||
|
||||
if [ -e new/Furnace.app/Contents/Resources/bin/furnace ]; then
|
||||
rm -v new/Furnace.app/Contents/Resources/bin/furnace
|
||||
rmdir new/Furnace.app/Contents/Resources/bin
|
||||
fi
|
||||
|
||||
echo "copying extra stuff"
|
||||
cp -v ../LICENSE new/LICENSE.txt
|
||||
cp -v ../res/releaseReadme/stable-mac.txt new/README
|
||||
|
|
|
@ -116,6 +116,12 @@ option(WITH_DEMOS "Install demo songs" ON)
|
|||
option(WITH_INSTRUMENTS "Install instruments" ON)
|
||||
option(WITH_WAVETABLES "Install wavetables" ON)
|
||||
option(SHOW_OPEN_ASSETS_MENU_ENTRY "Show option to open built-in assets directory (on supported platforms)" OFF)
|
||||
if (APPLE)
|
||||
option(FORCE_APPLE_BIN "Force enable binary installation to /bin" OFF)
|
||||
else()
|
||||
# not Apple - not needed
|
||||
set(FORCE_APPLE_BIN OFF)
|
||||
endif()
|
||||
|
||||
set(DEPENDENCIES_INCLUDE_DIRS extern/IconFontCppHeaders src/icon)
|
||||
|
||||
|
@ -1161,7 +1167,9 @@ if (NOT ANDROID OR TERMUX)
|
|||
endforeach()
|
||||
install(FILES res/logo.png RENAME furnace.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/1024x1024/apps)
|
||||
else()
|
||||
install(TARGETS furnace RUNTIME DESTINATION bin)
|
||||
if (NOT APPLE OR FORCE_APPLE_BIN)
|
||||
install(TARGETS furnace RUNTIME DESTINATION bin)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set(CPACK_PACKAGE_NAME "Furnace")
|
||||
|
|
|
@ -278,6 +278,7 @@ Available options:
|
|||
| `WITH_INSTRUMENTS` | `ON` | Install demo instruments on `make install` |
|
||||
| `WITH_WAVETABLES` | `ON` | Install wavetables on `make install` |
|
||||
| `SHOW_OPEN_ASSETS_MENU_ENTRY` | `OFF` | Show option to open built-in assets directory (on supported platforms) |
|
||||
| `FORCE_APPLE_BIN` | `OFF` | Enable installation of binaries (when doing `make install`) to PREFIX/bin on Apple platforms |
|
||||
|
||||
(\*) `ON` if system-installed JACK detected, otherwise `OFF`
|
||||
|
||||
|
|
Loading…
Reference in a new issue