Replace elf library hack by linking to libappimage

AppImageCommunity · Sep 5, 2018 · 66d4537 · 66d4537
1 parent 4858930
commit 66d4537
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 256 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "lib/sanitizers-cmake"]
 	path = lib/sanitizers-cmake
 	url = https://github.com/arsenm/sanitizers-cmake
+[submodule "lib/libappimage"]
+	path = lib/libappimage
+	url = https://github.com/AppImage/libappimage.git
diff --git a/cmake/DownloadProject.CMakeLists.cmake.in b/cmake/DownloadProject.CMakeLists.cmake.in
diff --git a/cmake/DownloadProject.LICENSE.txt b/cmake/DownloadProject.LICENSE.txt
diff --git a/cmake/DownloadProject.cmake b/cmake/DownloadProject.cmake
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -1 +1,3 @@
 add_subdirectory(zsync2 EXCLUDE_FROM_ALL)
+
+add_subdirectory(libappimage EXCLUDE_FROM_ALL)
diff --git a/lib/libappimage b/lib/libappimage
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -23,10 +23,6 @@ add_definitions("-DBUILD_DATE=\"${DATE}\"")
 add_definitions("-DBUILD_NUMBER=\"${BUILD_NUMBER}\"")
 
 
-# include ELF micro library
-add_subdirectory(elf)
-
-
 # core library
 add_library(
     libappimageupdate
@@ -41,7 +37,12 @@ set_target_properties(libappimageupdate
     PUBLIC_HEADER ${PROJECT_SOURCE_DIR}/include/appimage/update.h
 )
 # link thread libraries
-target_link_libraries(libappimageupdate PUBLIC elf PRIVATE ${CMAKE_THREAD_LIBS_INIT} libzsync2 ${CPR_LIBRARIES})
+target_link_libraries(libappimageupdate
+    PUBLIC libappimage_shared
+    PRIVATE ${CMAKE_THREAD_LIBS_INIT}
+    PRIVATE libzsync2
+    PRIVATE ${CPR_LIBRARIES}
+)
 # include directories, publicly
 target_include_directories(libappimageupdate PUBLIC
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>

diff --git a/src/elf/CMakeLists.txt b/src/elf/CMakeLists.txt