Merge pull request #89 from byrnHDF/master-git-url

jpeg repo added and lzf do not have git repo
HDFGroup · Dec 13, 2023 · 5c492e9 · 5c492e9
2 parents 26330ff + 8d8fa0a
commit 5c492e9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -140,14 +140,15 @@ if (NOT MINGW)
   elseif (WIN32 AND NOT CMAKE_C_COMPILER_ID MATCHES "Intel[Ll][Ll][Vv][Mm]")
     FILTER_OPTION (LZ4)
   else ()
-    set (ENABLE_LZ4 OFF CACHE BOOL "" FORCE)
+    FILTER_OPTION (LZ4)
+    #set (ENABLE_LZ4 OFF CACHE BOOL "" FORCE)
   endif ()
 else ()
   set (ENABLE_LZ4 OFF CACHE BOOL "" FORCE)
 endif ()
 
 # LZF filter
-if (NOT MINGW)
+if (NOT MINGW AND NOT H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT")
   FILTER_OPTION (LZF)
 else ()
   set (ENABLE_LZF OFF CACHE BOOL "" FORCE)

diff --git a/JPEG/config/cmake/cacheinit.cmake b/JPEG/config/cmake/cacheinit.cmake
@@ -23,8 +23,8 @@ set (HDF5_PACKAGE_NAME "hdf5" CACHE STRING "Name of HDF5 package" FORCE)
 
 set (HDF5_NAMESPACE "hdf5::" CACHE STRING "Name space of HDF5 library" FORCE)
 
-set (JPEG_GIT_URL "No repo www.ijg.org/files" CACHE STRING "Use JPEG from ILG" FORCE)
-set (JPEG_GIT_BRANCH "v9e" CACHE STRING "" FORCE)
+set (JPEG_GIT_URL "https://github.com/libjpeg-turbo/libjpeg-turbo.git" CACHE STRING "Use JPEG from TurboJPEG" FORCE)
+set (JPEG_GIT_BRANCH "jpeg-9e" CACHE STRING "" FORCE)
 
 set (JPEG_TGZ_ORIGPATH "https://www.ijg.org/files" CACHE STRING "Use PLUGINS from original location" FORCE)
 set (JPEG_TGZ_NAME "jpegsrc.v9e.tar.gz" CACHE STRING "Use JPEG from compressed file" FORCE)

diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
@@ -71,7 +71,7 @@ set (BLOSC_ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of BLOSC_ZLIB package" FO
 ############################# bzip2 ################################################
 
 set (BZ2_GIT_URL "https://github.com/libarchive/bzip2.git" CACHE STRING "Use BZ2 from  GitHub repository" FORCE)
-set (BZ2_GIT_BRANCH "master" CACHE STRING "" FORCE)
+set (BZ2_GIT_BRANCH "bzip2-1.0.8" CACHE STRING "" FORCE)
 
 set (BZ2_TGZ_ORIGPATH "https://github.com/libarchive/bzip2/archive/refs/tags" CACHE STRING "Use PLUGINS from original location" FORCE)
 set (BZ2_TGZ_NAME "bzip2-bzip2-1.0.8.tar.gz" CACHE STRING "Use BZ2 from compressed file" FORCE)
@@ -90,9 +90,8 @@ set (FPZIP_PACKAGE_NAME "fpzip" CACHE STRING "Name of FPZIP package" FORCE)
 
 ############################# jpeg ################################################
 
-set (JPEG_GIT_URL "No repo www.ijg.org/files" CACHE STRING "Use JPEG from ILG" FORCE)
-set (JPEG_GIT_BRANCH "v9e" CACHE STRING "" FORCE)
-#set (JPEG_TGZ_NAME "JPEG9d.tar.gz" CACHE STRING "Use JPEG from compressed file" FORCE)
+set (JPEG_GIT_URL "https://github.com/libjpeg-turbo/libjpeg-turbo.git" CACHE STRING "Use JPEG from TurboJPEG" FORCE)
+set (JPEG_GIT_BRANCH "jpeg-9e" CACHE STRING "" FORCE)
 
 set (JPEG_TGZ_ORIGPATH "https://www.ijg.org/files" CACHE STRING "Use PLUGINS from original location" FORCE)
 set (JPEG_TGZ_NAME "jpegsrc.v9e.tar.gz" CACHE STRING "Use JPEG from compressed file" FORCE)