From 3cb19e737848fab988d9d35e2cb42baf20d50b2b Mon Sep 17 00:00:00 2001
From: Christian Blichmann <cblichmann@google.com>
Date: Tue, 14 Jun 2022 05:27:12 -0700
Subject: [PATCH] GitHub Actions: Add libxls and tests

PiperOrigin-RevId: 454835693
Change-Id: I575ef9519ca829a2d4815e2dde4348cb9a42f36c
---
 .github/workflows/ubuntu-cmake-contrib.yml | 1 +
 contrib/libxls/CMakeLists.txt              | 8 ++++----
 contrib/libxls/test/CMakeLists.txt         | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ubuntu-cmake-contrib.yml b/.github/workflows/ubuntu-cmake-contrib.yml
index 4ef956f..5ba4bdd 100644
--- a/.github/workflows/ubuntu-cmake-contrib.yml
+++ b/.github/workflows/ubuntu-cmake-contrib.yml
@@ -18,6 +18,7 @@ jobs:
           - libidn2
           - libraw
           - libtiff
+          - libxls
           - lodepng
           - pffft
         ignore-errors: [true]
diff --git a/contrib/libxls/CMakeLists.txt b/contrib/libxls/CMakeLists.txt
index 5baf819..ac2d009 100644
--- a/contrib/libxls/CMakeLists.txt
+++ b/contrib/libxls/CMakeLists.txt
@@ -15,6 +15,7 @@
 cmake_minimum_required(VERSION 3.13..3.22)
 project(sapi_libxls C CXX)
 include(CTest)
+include(GoogleTest)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -28,7 +29,7 @@ endif()
 
 FetchContent_Declare(libxls
   GIT_REPOSITORY https://github.com/libxls/libxls.git
-  GIT_TAG        448240067919707eb95fb009f76f3fdb439b1427
+  GIT_TAG        448240067919707eb95fb009f76f3fdb439b1427 # 2021-01-04
 )
 
 FetchContent_GetProperties(libxls)
@@ -72,7 +73,6 @@ add_library(libxls STATIC
   "${libxls_SOURCE_DIR}/src/xls.c"
   "${libxls_SOURCE_DIR}/src/xlstool.c"
 )
-
 target_include_directories(libxls PUBLIC
   "${libxls_SOURCE_DIR}"
   "${libxls_SOURCE_DIR}/include"
@@ -102,10 +102,10 @@ target_include_directories(sapi_libxls INTERFACE
   "${PROJECT_BINARY_DIR}"
 )
 
-if(SAPI_ENABLE_EXAMPLES)
+if(SAPI_BUILD_EXAMPLES)
   add_subdirectory(example)
 endif()
 
-if(SAPI_ENABLE_TESTS)
+if(BUILD_TESTING AND SAPI_BUILD_TESTING)
   add_subdirectory(test)
 endif()
diff --git a/contrib/libxls/test/CMakeLists.txt b/contrib/libxls/test/CMakeLists.txt
index 53a8c35..9990e78 100644
--- a/contrib/libxls/test/CMakeLists.txt
+++ b/contrib/libxls/test/CMakeLists.txt
@@ -25,4 +25,6 @@ target_link_libraries(sapi_libxls_test
           sapi::test_main
 )
 
-gtest_discover_tests(sapi_libxls_test PROPERTIES ENVIRONMENT "TEST_FILES_DIR=${PROJECT_SOURCE_DIR}/files")
+gtest_discover_tests(sapi_libxls_test PROPERTIES
+  ENVIRONMENT "TEST_FILES_DIR=${PROJECT_SOURCE_DIR}/files"
+)