Skip to content

Commit

Permalink
AppImage: Allow unset VCPKG_LIB_PATH variable
Browse files Browse the repository at this point in the history
Only if you're building on Linux with vcpkg should you worry about
having to set this variable.

Signed-off-by: Avery King <[email protected]>
  • Loading branch information
generic-pers0n committed Sep 5, 2024
1 parent 19a3bc5 commit ffee3bb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
8 changes: 4 additions & 4 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,10 @@ 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
to make an AppImage as it is unnecessary.

First, you need to set `VCPKG_LIB_PATH` to the directory vcpkg copied libraries
too if you are using vcpkg. If not, set this to an empty string. Next, run
`cpack` from the root of your build directory. The AppImage will be in the
`package/` directory of the build folder.
First, if you are using vcpkg, you need to set `VCPKG_LIB_PATH` to the
directory vcpkg copied libraries too. Otherwise, setting this variable is not
necessary. Next, run `cpack` from the root of your build directory. The
AppImage will be in the `package/` directory of the build folder.

## Build options

Expand Down
7 changes: 7 additions & 0 deletions linux/create_appimage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,13 @@ ln -sf share/icons/hicolor/scalable/apps/tenacity.svg "${appdir}/.DirIcon"
# Bundle dependencies
#============================================================================

# VCPKG_LIB_PATH is the path where vcpkg stores built libraries
# FIXME: Come up with a solution in CMake instead or something.
if [[ -z "${VCPKG_LIB_PATH}" ]];
then
VCPKG_LIB_PATH=""
fi

# HACK: Some wxWidget libraries depend on themselves. Add
# 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-}"
Expand Down

0 comments on commit ffee3bb

Please sign in to comment.