pyrox.dev
lol
1Submodule lib/libappimage contains modified content
2diff --git a/lib/libappimage/cmake/dependencies.cmake b/lib/libappimage/cmake/dependencies.cmake
3index 8d96484..c7b17a1 100644
4--- a/lib/libappimage/cmake/dependencies.cmake
5+++ b/lib/libappimage/cmake/dependencies.cmake
6@@ -91,9 +91,18 @@ if(NOT USE_SYSTEM_SQUASHFUSE)
7 INCLUDE_DIRS "<SOURCE_DIR>"
8 )
9 else()
10- message(STATUS "Using system squashfuse")
11+ message(STATUS "Using system squashfsfuse from ${SQUASHFUSE}")
12
13- import_pkgconfig_target(TARGET_NAME libsquashfuse PKGCONFIG_TARGET squashfuse)
14+ add_library(libsquashfuse INTERFACE IMPORTED GLOBAL)
15+
16+ set(squashfuse_INCLUDE_DIRS "${SQUASHFUSE}/include")
17+ set(squashfuse_LIBRARIES "${SQUASHFUSE}/lib/libsquashfuse.a;${SQUASHFUSE}/lib/libsquashfuse_ll.a;${SQUASHFUSE}/lib/libfuseprivate.a")
18+
19+ set_property(
20+ TARGET libsquashfuse
21+ PROPERTY INTERFACE_LINK_LIBRARIES ${squashfuse_LIBRARIES}
22+ )
23+ include_directories(${squashfuse_INCLUDE_DIRS})
24 endif()
25
26
27diff --git a/src/appimagetool.c b/src/appimagetool.c
28index 6b37419..23425e7 100644
29--- a/src/appimagetool.c
30+++ b/src/appimagetool.c
31@@ -38,7 +38,7 @@
32 #include <argp.h>
33
34 #include <fcntl.h>
35-#include "squashfuse.h"
36+#include <squashfuse.h>
37
38 #include <sys/types.h>
39 #include <sys/stat.h>
40@@ -96,7 +96,7 @@ static void die(const char *msg) {
41 }
42
43 /* Function that prints the contents of a squashfs file
44-* using libsquashfuse (#include "squashfuse.h") */
45+* using libsquashfuse (#include <squashfuse.h>) */
46 int sfs_ls(char* image) {
47 sqfs_err err = SQFS_OK;
48 sqfs_traverse trv;
49diff --git a/src/appimagetoolnoglib.c b/src/appimagetoolnoglib.c
50index f900e76..ffa87f8 100644
51--- a/src/appimagetoolnoglib.c
52+++ b/src/appimagetoolnoglib.c
53@@ -3,7 +3,7 @@
54
55 #include <stdlib.h>
56 #include <fcntl.h>
57-#include "squashfuse.h"
58+#include <squashfuse.h>
59
60 #include <sys/types.h>
61 #include <sys/stat.h>
62@@ -118,7 +118,7 @@ int is_regular_file(const char *path)
63 }
64
65 /* Function that prints the contents of a squashfs file
66- * using libsquashfuse (#include "squashfuse.h") */
67+ * using libsquashfuse (#include <squashfuse.h>) */
68 int sfs_ls(char* image) {
69 sqfs_err err = SQFS_OK;
70 sqfs_traverse trv;
71diff --git a/src/runtime.c b/src/runtime.c
72index bada3af..70a642b 100644
73--- a/src/runtime.c
74+++ b/src/runtime.c
75@@ -29,7 +29,7 @@
76
77 #define _GNU_SOURCE
78
79-#include "squashfuse.h"
80+#include <squashfuse.h>
81 #include <squashfs_fs.h>
82 #include <nonstd.h>