Separate libplist in another package

gnl00 · May 23, 2023 · e302d13 · e302d13
1 parent cb953a2
commit e302d13
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 1,380 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,9 +18,18 @@ add_library(provision STATIC ${PROVISION_D_SOURCES})
 target_include_directories(provision PUBLIC ${PROVISION_SOURCE_DIR})
 
 if (link_libplist_dynamic)
-    add_library(plist INTERFACE)
     target_compile_versions(provision PUBLIC LibPlist)
-    target_compile_versions(plist INTERFACE LibPlistDynamic)
+
+    include(UseDub)
+    FetchContent_Declare(
+        plist_proj
+        GIT_REPOSITORY https://github.com/Dadoum/libplist-d
+        GIT_TAG d494cf3fe79a2bb20583173c0c8cf85ef33b719e
+        PATCH_COMMAND ${DUB_DIRECTORY}/CMakeTmp/DubToCMake -c dynamic -s plist-d
+    )
+    FetchContent_MakeAvailable(plist_proj)
+
+    add_library(plist ALIAS plist-d)
 else()
     if(NOT CMAKE_CROSSCOMPILING)
         pkg_check_modules(plist IMPORTED_TARGET libplist-2.0)
@@ -32,16 +41,27 @@ else()
 
     if (plist_FOUND AND NOT use_native_plist)
         message("Using libplist. ")
-        add_library(plist ALIAS PkgConfig::plist)
         target_compile_versions(provision PUBLIC LibPlist)
+
+        include(UseDub)
+        FetchContent_Declare(
+            plist_proj
+            GIT_REPOSITORY https://github.com/Dadoum/libplist-d
+            GIT_TAG d494cf3fe79a2bb20583173c0c8cf85ef33b719e
+            PATCH_COMMAND ${DUB_DIRECTORY}/CMakeTmp/DubToCMake -c static -s plist-d
+        )
+        FetchContent_MakeAvailable(plist_proj)
+
+        add_library(plist INTERFACE)
+        target_link_libraries(plist INTERFACE PkgConfig::plist plist-d)
     else()
         message(WARNING "Using fallback Property list parser. ")
 
         include(UseDub)
         FetchContent_Declare(
-        plist_proj
-        GIT_REPOSITORY https://github.com/hatf0/plist
-        PATCH_COMMAND ${DUB_DIRECTORY}/CMakeTmp/DubToCMake -s plist
+            plist_proj
+            GIT_REPOSITORY https://github.com/hatf0/plist
+            PATCH_COMMAND ${DUB_DIRECTORY}/CMakeTmp/DubToCMake -s plist
         )
         FetchContent_MakeAvailable(plist_proj)
     endif()

diff --git a/dub.sdl b/dub.sdl
@@ -17,6 +17,7 @@ configuration "plist-d" {
 
 configuration "libplist" {
     versions "LibPlist"
+    dependency "plist-d" repository="git+https://github.com/Dadoum/libplist-d.git" version="d494cf3fe79a2bb20583173c0c8cf85ef33b719e"
 }
 
 subPackage {

diff --git a/lib/provision/adi.d b/lib/provision/adi.d
@@ -14,7 +14,7 @@ import std.string;
 import slf4d;
 
 version (LibPlist) {
-    import provision.plist;
+    import plist;
 } else {
     import plist;
     import plist.types;