AppImage: Make VCPKG_LIB_PATH optional

Signed-off-by: Avery King <gperson@disroot.org>
This commit is contained in:
Avery King
2025-03-21 14:52:28 -07:00
parent 6ec57ad264
commit 41f15aa8d0
2 changed files with 16 additions and 7 deletions

View File

@@ -380,13 +380,18 @@ cmake --install build
### Linux: Building an AppImage ### Linux: Building an AppImage
You can build an AppImage yourself. This requires that you have previously You can build an AppImage yourself. This requires that you have previously
built Tenacity. Note that you do not need to have installed Tenacity in order built Tenacity. There is no need to install Tenacity first.
to make an AppImage as it is unnecessary.
First, you need to set `VCPKG_LIB_PATH` to the directory vcpkg copied libraries If you've used vcpkg in your build, you must set `VCPKG_LIB_PATH` to the
too if you are using vcpkg. If not, set this to an empty string. Next, run directory vcpkg copied libraries too. Otherwise, there is no need to set it at
`cpack` from the root of your build directory. The AppImage will be in the all.
`package/` directory of the build folder.
**NOTE**: Ensure that you are correctly setting `VCPKG_LIB_PATH` by ensuring
the directory exists and there are libraries in that folder. If the directory
doesn't exist, required libraries won't get packaged.
To build an AppImage, simply run `cpack` from the root of your build directory.
The AppImage will be in the `package/` directory of the build folder.
## Build options ## Build options

View File

@@ -93,7 +93,11 @@ ln -sf share/icons/hicolor/scalable/apps/tenacity.svg "${appdir}/.DirIcon"
# HACK: Some wxWidget libraries depend on themselves. Add # HACK: Some wxWidget libraries depend on themselves. Add
# them to LD_LIBRARY_PATH so that linuxdeploy can find them. # them to LD_LIBRARY_PATH so that linuxdeploy can find them.
export LD_LIBRARY_PATH="${appdir}/usr/lib/tenacity:${VCPKG_LIB_PATH}:${LD_LIBRARY_PATH-}" export LD_LIBRARY_PATH="${appdir}/usr/lib/tenacity:${LD_LIBRARY_PATH-}"
if [ -e "${VCPKG_LIB_PATH} "]; then
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${VCPKG_LIB_PATH}"
fi
# When running on GitHub actions - libararies are sometimes installed into the DEB_HOST_MULTIARCH # When running on GitHub actions - libararies are sometimes installed into the DEB_HOST_MULTIARCH
# based location # based location