Skip to content

Commit 6f44629

Browse files
authored
Merge pull request #846 from AppImage/extract-libappimage
Extract libappimage
2 parents 6470b9b + 4e5c4cd commit 6f44629

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+48
-6527
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "cmake/sanitizers-cmake"]
22
path = cmake/sanitizers-cmake
33
url = https://github.com/arsenm/sanitizers-cmake
4+
[submodule "lib/libappimage"]
5+
path = lib/libappimage
6+
url = https://github.com/AppImage/libappimage.git

CMakeLists.txt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
6565

6666
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
6767

68-
# find paths to tools, incorporating optional TOOLS_PREFIX
69-
include(cmake/tools.cmake)
70-
7168
# configure dependencies
69+
add_subdirectory(lib)
70+
71+
include(lib/libappimage/cmake/tools.cmake)
7272
include(cmake/dependencies.cmake)
7373

7474

@@ -89,9 +89,3 @@ set(APPIMAGEKIT_PACKAGE_DEBS FALSE CACHE BOOL "")
8989
if(APPIMAGEKIT_PACKAGE_DEBS)
9090
include(cmake/cpack_debs.cmake)
9191
endif()
92-
93-
################################
94-
# unit and functionality tests #
95-
################################
96-
97-
add_subdirectory(tests)

build.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ if [ -d /deps/lib ]; then
8080
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":/deps/lib/
8181
fi
8282

83-
ldd tests/test_*
84-
85-
if [ $RUN_TESTS -ne 0 ]; then
86-
ctest -V
87-
fi
88-
8983
xxd src/runtime | head -n 1
9084

9185
# Do NOT strip runtime

cmake/AppImageKitConfig.cmake.in

Lines changed: 0 additions & 25 deletions
This file was deleted.

cmake/AppImageKitConfigVersion.cmake.in

Lines changed: 0 additions & 11 deletions
This file was deleted.

cmake/FindINotify.cmake

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)