Add strategy matrix for build-and-test job. Fix bugs in build system and CI.

Author: ktchu

.github/workflows/CI.yml

@@ -17,8 +17,15 @@ concurrency:
   cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 
 jobs:
-  ubuntu-build-and-test:
-    runs-on: ubuntu-latest
+  build-and-test:
+    name: ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest]
+        arch: [x64, x86]
+
+    runs-on: ${{ matrix.os }}
 
     steps:
     - name: Checkout
@@ -27,18 +34,25 @@ jobs:
     - name: Create Build Directory
       run: cmake -E make_directory ${{github.workspace}}/build
 
-    - name: Install Packages
+    - name: Install Packages (ubuntu)
+      if: runner.os == 'Linux'
+
       run: |
         sudo apt-get update -qq
-        sudo apt-get install -y cmake
         sudo apt-get install -y iwyu
         sudo apt-get install -y libgtest-dev
 
+    - name: Install Packages (macOS)
+      if: runner.os == 'macOS'
+
+      run: |
+        brew reinstall gcc
+        brew install include-what-you-use
+        brew install googletest
+
     - name: Configure CMake
       run: |
-        cmake --version
         cmake -S . -B build
-        ls build
 
     - name: Build library and tests
       run: cmake --build build --target tests

tests/CMakeLists.txt

@@ -20,12 +20,11 @@ function(add_test_target TEST_PROGRAM SOURCE_FILES)
     add_executable(${TEST_PROGRAM} ${SOURCE_FILES})
     add_dependencies(${TEST_PROGRAM} LSMLIB::lsm)
     target_include_directories(${TEST_PROGRAM} PUBLIC ${GTEST_INCLUDE_DIRS})
-    target_link_directories(${TEST_PROGRAM} PUBLIC ${GTEST_LIB_DIRS})
     target_link_libraries(
         ${TEST_PROGRAM}
         PRIVATE lsm
-        gtest
-        gtest_main
+        ${GTEST_LIBRARIES}
+        ${GTEST_MAIN_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}
     )
 endfunction()

tests/boundary_conditions/test_neumann_bc_1d.cc

@@ -13,9 +13,11 @@
 
 #include <math.h>                       // for fabs
 #include <stddef.h>                     // for NULL
-#include "gtest/gtest-message.h"        // for Message
-#include "gtest/gtest-test-part.h"      // for TestPartResult
-#include "gtest/gtest_pred_impl.h"      // for EXPECT_NEAR, SuiteApiResolver
+
+#include <gtest/gtest-message.h>        // for Message
+#include <gtest/gtest-test-part.h>      // for TestPartResult
+#include <gtest/gtest_pred_impl.h>      // for EXPECT_NEAR, SuiteApiResolver
+                                        //
 #include "lsm_boundary_conditions1d.h"  // for LSM1D_HOMOGENEOUS_NEUMANN_ENO1
 #include "lsm_spatial_derivatives1d.h"  // for LSM1D_HJ_ENO1, LSM1D_HJ_ENO2
 #include "lsmlib_config.h"              // for LSMLIB_REAL

tests/boundary_conditions/test_neumann_bc_2d.cc

@@ -13,9 +13,11 @@
 
 #include <math.h>                       // for fabs
 #include <stddef.h>                     // for NULL
-#include "gtest/gtest-message.h"        // for Message
-#include "gtest/gtest-test-part.h"      // for TestPartResult
-#include "gtest/gtest_pred_impl.h"      // for EXPECT_NEAR, SuiteApiResolver
+
+#include <gtest/gtest-message.h>        // for Message
+#include <gtest/gtest-test-part.h>      // for TestPartResult
+#include <gtest/gtest_pred_impl.h>      // for EXPECT_NEAR, SuiteApiResolver
+                                        //
 #include "lsm_boundary_conditions2d.h"  // for LSM2D_HOMOGENEOUS_NEUMANN_ENO1
 #include "lsm_spatial_derivatives2d.h"  // for LSM2D_HJ_ENO1, LSM2D_HJ_ENO2
 #include "lsmlib_config.h"              // for LSMLIB_REAL

tests/boundary_conditions/test_neumann_bc_3d.cc

@@ -13,9 +13,11 @@
 
 #include <math.h>                       // for fabs
 #include <stddef.h>                     // for NULL
-#include "gtest/gtest-message.h"        // for Message
-#include "gtest/gtest-test-part.h"      // for TestPartResult
-#include "gtest/gtest_pred_impl.h"      // for EXPECT_NEAR, SuiteApiResolver
+
+#include <gtest/gtest-message.h>        // for Message
+#include <gtest/gtest-test-part.h>      // for TestPartResult
+#include <gtest/gtest_pred_impl.h>      // for EXPECT_NEAR, SuiteApiResolver
+
 #include "lsm_boundary_conditions3d.h"  // for LSM3D_HOMOGENEOUS_NEUMANN_ENO1
 #include "lsm_spatial_derivatives3d.h"  // for LSM3D_HJ_ENO1, LSM3D_HJ_ENO2
 #include "lsmlib_config.h"              // for LSMLIB_REAL

tests/fast_marching_method/test_FMM_Heap.cc

@@ -14,9 +14,9 @@
 #include <stdlib.h>                 // for rand, NULL, srand, RAND_MAX
 #include <time.h>                   // for time
 
-#include "gtest/gtest-message.h"    // for Message
-#include "gtest/gtest-test-part.h"  // for TestPartResult
-#include "gtest/gtest_pred_impl.h"  // for Test, ASSERT_EQ, ASSERT_LE, ...
+#include <gtest/gtest-message.h>    // for Message
+#include <gtest/gtest-test-part.h>  // for TestPartResult
+#include <gtest/gtest_pred_impl.h>  // for Test, ASSERT_EQ, ASSERT_LE, ...
 
 #include "lsmlib_config.h"
 #include "FMM_Heap.h"

tests/geometry/test_find_line_in_tetrahedron.cc

@@ -39,9 +39,11 @@
 
 #include <math.h>                   // for fabs
 #include <stdio.h>                  // for printf
-#include "gtest/gtest-message.h"    // for Message
-#include "gtest/gtest-test-part.h"  // for TestPartResult
-#include "gtest/gtest_pred_impl.h"  // for CmpHelperGT, SuiteApiResolver
+
+#include <gtest/gtest-message.h>    // for Message
+#include <gtest/gtest-test-part.h>  // for TestPartResult
+#include <gtest/gtest_pred_impl.h>  // for CmpHelperGT, SuiteApiResolver
+
 #include "lsm_geometry3d.h"         // for LSM3D_findLineInTetrahedron
 #include "lsmlib_config.h"          // for LSMLIB_ZERO_TOL, LSMLIB_REAL
 

tests/toolbox/test_calculus_toolbox.cc

@@ -11,8 +11,8 @@
  * ---------------------------------------------------------------------
  */
 
-#include "gtest/gtest-message.h"    // for Message
-#include "gtest/gtest-test-part.h"  // for TestPartResult
+#include <gtest/gtest-message.h>    // for Message
+#include <gtest/gtest-test-part.h>  // for TestPartResult
 #include "gtest/gtest_pred_impl.h"  // for SuiteApiResolver, EXPECT_NEAR
 
 #include "lsmlib_config.h"