Skip to content

Commit 695a0f1

Browse files
authored
Simplify AppImage build (#111)
* simplify AppImage build * switch to portal in appimage build
1 parent 0c3fd6f commit 695a0f1

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ project(Xpano)
44
OPTION(BUILD_TESTING "Build tests" OFF)
55
OPTION(XPANO_STATIC_VCRT "Build with static VCRT" OFF)
66
OPTION(XPANO_WITH_MULTIBLEND "Build with multiblend" ON)
7-
OPTION(XPANO_INSTALL_DEPENDENCIES "Install all dependencies" OFF)
87

98
if(XPANO_STATIC_VCRT)
109
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
@@ -160,14 +159,9 @@ else()
160159
endif()
161160

162161
install(TARGETS
163-
Xpano RUNTIME_DEPENDENCY_SET XpanoDeps RUNTIME
162+
Xpano RUNTIME
164163
)
165164

166-
if(XPANO_INSTALL_DEPENDENCIES)
167-
set_target_properties(Xpano PROPERTIES INSTALL_RPATH "\${ORIGIN}/../lib")
168-
install(RUNTIME_DEPENDENCY_SET XpanoDeps DESTINATION "${CMAKE_INSTALL_PREFIX}/lib")
169-
endif()
170-
171165
install(FILES
172166
"$<TARGET_RUNTIME_DLLS:Xpano>"
173167
TYPE BIN

misc/build/build-appimage.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ cp opencv/LICENSE licenses/opencv-license.txt
1010

1111
cmake -B build \
1212
-DCMAKE_INSTALL_PREFIX=/usr \
13-
-DXPANO_INSTALL_DEPENDENCIES=ON \
14-
-DXPANO_EXTRA_LICENSES=licenses
13+
-DXPANO_EXTRA_LICENSES=licenses \
14+
-DNFD_PORTAL=ON
1515

1616
DESTDIR=AppDir cmake --build build -j $(nproc) --target install
1717

18+
export LD_LIBRARY_PATH=SDL/install/lib:exiv2/install/lib:opencv/install/lib
19+
1820
linuxdeploy-x86_64.AppImage --appdir build/AppDir --output appimage

xpano/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace xpano::version {
99

1010
constexpr int kMajor = 0;
1111
constexpr int kMinor = 16;
12-
constexpr int kPatch = 1;
12+
constexpr int kPatch = 3;
1313

1414
using Triplet = std::tuple<int, int, int>;
1515

0 commit comments

Comments
 (0)