zlib json correct

Author: scivision

bzip2.cmake

@@ -2,7 +2,7 @@
 
 include(FetchContent)
 
-string(JSON bzip2_url GET ${json_meta} bzip2 git)
+string(JSON bzip2_url GET ${json_meta} bzip2 url)
 string(JSON bzip2_tag GET ${json_meta} bzip2 tag)
 
 set(bzip2_args

expat.cmake

@@ -11,7 +11,7 @@ if(EXPAT_FOUND)
   return()
 endif()
 
-string(JSON expat_url GET ${json_meta} expat git)
+string(JSON expat_url GET ${json_meta} expat url)
 string(JSON expat_tag GET ${json_meta} expat tag)
 
 set(expat_args

ffi.cmake

@@ -14,7 +14,7 @@ if(NOT LIBTOOL_EXECUTABLE)
   message(FATAL_ERROR "FFI needs libtool")
 endif()
 
-string(JSON ffi_url GET ${json_meta} ffi git)
+string(JSON ffi_url GET ${json_meta} ffi url)
 string(JSON ffi_tag GET ${json_meta} ffi tag)
 
 set(ffi_args

libraries.json

@@ -4,15 +4,15 @@
   "sha256": "80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19"
 },
 "bzip2": {
-  "git": "https://github.com/gemini3d/bzip2-cmake.git",
+  "url": "https://github.com/gemini3d/bzip2-cmake.git",
   "tag": "v1.0.8.0"
 },
 "expat": {
-  "git": "https://github.com/libexpat/libexpat.git",
+  "url": "https://github.com/libexpat/libexpat.git",
   "tag": "R_2_4_8"
 },
 "ffi": {
-  "git": "https://github.com/libffi/libffi.git",
+  "url": "https://github.com/libffi/libffi.git",
   "tag": "v3.4.2"
 },
 "libtool": {
@@ -24,15 +24,15 @@
   "sha256": "f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02"
 },
 "ssl": {
-  "git": "https://github.com/openssl/openssl.git",
+  "url": "https://github.com/openssl/openssl.git",
   "tag": "OpenSSL_1_1_1n"
 },
 "xz": {
-  "git": "https://github.com/xz-mirror/xz.git",
+  "url": "https://github.com/xz-mirror/xz.git",
   "tag": "v5.2.5"
 },
 "zlib": {
-  "url" : "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.0.6.tar.gz",
-  "sha256": "8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6"
+  "url" : "https://github.com/zlib-ng/zlib-ng.git",
+  "tag": "2.0.6"
 }
 }

lzma.cmake

@@ -4,50 +4,25 @@
 
 include(ExternalProject)
 
-string(JSON xz_url GET ${json_meta} xz git)
+string(JSON xz_url GET ${json_meta} xz url)
 string(JSON xz_tag GET ${json_meta} xz tag)
 
 
-set(xz_build_system cmake)
-
-if(xz_build_system STREQUAL cmake)
-
-  set(xz_cmake_args
-  -DBUILD_TESTING:BOOL=false
-  -DCMAKE_BUILD_TYPE=Release
-  -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-  -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-  -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=on
-  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-  )
-
-  ExternalProject_Add(xz
-  GIT_REPOSITORY ${xz_url}
-  GIT_TAG ${xz_tag}
-  GIT_SHALLOW true
-  TEST_COMMAND ""
-  CMAKE_ARGS ${xz_cmake_args}
-  CONFIGURE_HANDLED_BY_BUILD ON
-  INACTIVITY_TIMEOUT 15
-  )
-
-else()
-
-  set(xz_args
-  --prefix=${CMAKE_INSTALL_PREFIX}
-  --disable-doc
-  CC=${CC}
-  )
-
-  ExternalProject_Add(xz
-  URL ${xz_url}
-  URL_HASH SHA256=${xz_sha256}
-  CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xz_args} CFLAGS=${CMAKE_C_FLAGS} LDFLAGS=${LDFLAGS}
-  BUILD_COMMAND ${MAKE_EXECUTABLE} -j
-  INSTALL_COMMAND ${MAKE_EXECUTABLE} -j install
-  TEST_COMMAND ""
-  CONFIGURE_HANDLED_BY_BUILD ON
-  INACTIVITY_TIMEOUT 15
-  )
-
-endif()
+set(xz_cmake_args
+-DBUILD_TESTING:BOOL=false
+-DCMAKE_BUILD_TYPE=Release
+-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=on
+-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+)
+
+ExternalProject_Add(xz
+GIT_REPOSITORY ${xz_url}
+GIT_TAG ${xz_tag}
+GIT_SHALLOW true
+TEST_COMMAND ""
+CMAKE_ARGS ${xz_cmake_args}
+CONFIGURE_HANDLED_BY_BUILD ON
+INACTIVITY_TIMEOUT 15
+)

ssl.cmake

@@ -27,7 +27,7 @@ if(OPENSSL_FOUND)
   return()
 endif()
 
-string(JSON ssl_url GET ${json_meta} ssl git)
+string(JSON ssl_url GET ${json_meta} ssl url)
 string(JSON ssl_tag GET ${json_meta} ssl tag)
 
 set(ssl_args

zlib.cmake

@@ -23,11 +23,11 @@ set(zlib_cmake_args
 # CMAKE_POSITION_INDEPENDENT_CODE=on is needed for zlib to work with Python, even when using static libs.
 
 string(JSON zlib_url GET ${json_meta} zlib url)
-string(JSON zlib_sha256 GET ${json_meta} zlib sha256)
+string(JSON zlib_tag GET ${json_meta} zlib tag)
 
 ExternalProject_Add(zlib
-URL ${zlib_url}
-URL_HASH SHA256=${zlib_sha256}
+GIT_REPOSITORY ${zlib_url}
+GIT_TAG ${zlib_tag}
 GIT_SHALLOW true
 CMAKE_ARGS ${zlib_cmake_args}
 CMAKE_GENERATOR ${EXTPROJ_GEN}