Promote dkjson to standard dependency

koreader · Jan 7, 2025 · fb3206c · fb3206c
1 parent fbebb8b
commit fb3206c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -185,6 +185,9 @@ declare_project(thirdparty/czmq DEPENDS libzmq ${EXCLUDE_FROM_ALL})
 # djvulibre
 declare_project(thirdparty/djvulibre DEPENDS libjpeg-turbo EXCLUDE_FROM_ALL)
 
+# dkjson
+declare_project(thirdparty/dkjson)
+
 # dropbear
 if(CERVANTES OR KINDLE OR KOBO OR POCKETBOOK)
     set(EXCLUDE_FROM_ALL)
@@ -421,7 +424,6 @@ if(EMULATE_READER)
     foreach(PRJ
             busted
             cluacov
-            dkjson
             lua-term
             lua_cliargs
             luacov

diff --git a/thirdparty/dkjson/CMakeLists.txt b/thirdparty/dkjson/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Build in source tree.
+set(BINARY_DIR ${SOURCE_DIR})
+
+append_install_commands(INSTALL_CMD dkjson.lua DESTINATION common)
+
+external_project(
+    DOWNLOAD URL d7754634dcbe6e95f3b6b55fd4ca5ceb
+    http://dkolf.de/dkjson-lua/dkjson-2.8.tar.gz
+    INSTALL_COMMAND ${INSTALL_CMD}
+)
diff --git a/thirdparty/spec/dkjson/CMakeLists.txt b/thirdparty/spec/dkjson/CMakeLists.txt