From 2a65b72ea635a990ddec1e79b1ddcc70202a6f8c Mon Sep 17 00:00:00 2001
From: Christian Blichmann <cblichmann@google.com>
Date: Fri, 10 Jun 2022 06:15:03 -0700
Subject: [PATCH] Add c-blosc and hunspell and their tests to CI

- Minor reformatting in `CMakeLists.txt`
- Update c-blosc to latest revision

PiperOrigin-RevId: 454148849
Change-Id: I7a659c0786b1dc35d94059a518a0ec2859055432
---
 .github/workflows/ubuntu-cmake-contrib.yml |  9 +++++-
 contrib/c-blosc/CMakeLists.txt             | 19 ++++++-------
 contrib/hunspell/CMakeLists.txt            | 32 ++++++++++------------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ubuntu-cmake-contrib.yml b/.github/workflows/ubuntu-cmake-contrib.yml
index 146ee15..0560f02 100644
--- a/.github/workflows/ubuntu-cmake-contrib.yml
+++ b/.github/workflows/ubuntu-cmake-contrib.yml
@@ -11,7 +11,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04]
-        contrib: [brotli, jsonnet, libraw, lodepng, libtiff, pffft]
+        contrib:
+          - brotli
+          - c-blosc
+          - jsonnet
+          - libraw
+          - libtiff
+          - lodepng
+          - pffft
         ignore-errors: [true]
         include:
           - compiler: clang
diff --git a/contrib/c-blosc/CMakeLists.txt b/contrib/c-blosc/CMakeLists.txt
index da112a9..5b14149 100644
--- a/contrib/c-blosc/CMakeLists.txt
+++ b/contrib/c-blosc/CMakeLists.txt
@@ -16,29 +16,26 @@ cmake_minimum_required(VERSION 3.13..3.22)
 
 project(sapi_blosc CXX)
 include(CTest)
+include(GoogleTest)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 if(NOT TARGET sapi::sapi)
   set(SAPI_ROOT "../.." CACHE PATH "Path to the Sandboxed API source tree")
-  add_subdirectory(
-    "${SAPI_ROOT}"
-    "${CMAKE_BINARY_DIR}/sandboxed-api-build"
-    EXCLUDE_FROM_ALL
-  )
+  add_subdirectory("${SAPI_ROOT}"
+                   "${CMAKE_BINARY_DIR}/sandboxed-api-build"
+                   EXCLUDE_FROM_ALL)
 endif()
 
+FetchContent_Declare(libblosc
+  GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
+  GIT_TAG        ad6361f0151f830efb5ae113211c3559ab969886 # 2022-05-31
+)
 set(HIDE_SYMBOLS OFF CACHE BOOL "" FORCE)
 set(BUILD_BENCHMARKS OFF CACHE BOOL "" FORCE)
 set(BUILD_FUZZERS OFF CACHE BOOL "" FORCE)
 set(BUILD_TESTS OFF CACHE BOOL "" FORCE)
-FetchContent_Declare(
-  libblosc
-
-  GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
-  GIT_TAG 5b68ad8a6c25e7f013e78b44e8b3bf3b5a6b9cc7
-)
 FetchContent_MakeAvailable(libblosc)
 
 add_sapi_library(sapi_blosc
diff --git a/contrib/hunspell/CMakeLists.txt b/contrib/hunspell/CMakeLists.txt
index ae42b4a..5bd5adc 100644
--- a/contrib/hunspell/CMakeLists.txt
+++ b/contrib/hunspell/CMakeLists.txt
@@ -16,12 +16,11 @@ cmake_minimum_required(VERSION 3.13..3.22)
 
 project(sapi_hunspell CXX)
 include(CTest)
+include(GoogleTest)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
-set(SAPI_ROOT "" CACHE PATH "Path to the Sandboxed API source tree")
-
 if(NOT TARGET sapi::sapi)
   set(SAPI_ROOT "../.." CACHE PATH "Path to the Sandboxed API source tree")
   add_subdirectory("${SAPI_ROOT}"
@@ -31,7 +30,7 @@ endif()
 
 FetchContent_Declare(libhunspell
   GIT_REPOSITORY https://github.com/hunspell/hunspell.git
-  GIT_TAG 31e6d6323026a3bef12c5912ce032d88bfef2091
+  GIT_TAG        31e6d6323026a3bef12c5912ce032d88bfef2091 # 2021-10-15
 )
 
 FetchContent_GetProperties(libhunspell)
@@ -103,26 +102,23 @@ target_include_directories(hunspell PUBLIC
 
 set(libhunspell_INCLUDE_DIR "${libhunspell_SOURCE_DIR}/src/hunspell")
 
-add_sapi_library(
-  sapi_hunspell
+add_sapi_library(sapi_hunspell
+  FUNCTIONS Hunspell_create
+            Hunspell_create_key
+            Hunspell_destroy
 
-  FUNCTIONS
-    Hunspell_create
-    Hunspell_create_key
-    Hunspell_destroy
+            Hunspell_spell
+            Hunspell_get_dic_encoding
 
-    Hunspell_spell
-    Hunspell_get_dic_encoding
+            Hunspell_suggest
+            Hunspell_analyze
 
-    Hunspell_suggest
-    Hunspell_analyze
+            Hunspell_add
+            Hunspell_remove
 
-    Hunspell_add
-    Hunspell_remove
+            Hunspell_free_list
 
-    Hunspell_free_list
-  INPUTS
-    "${libhunspell_INCLUDE_DIR}/hunspell.h"
+  INPUTS "${libhunspell_INCLUDE_DIR}/hunspell.h"
 
   LIBRARY hunspell
   LIBRARY_NAME Hunspell