Merge branch 'develop' into plonk

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
     - name: install-dependencies-macos
       if: matrix.os == 'macos-11'
       run: |
-        brew link llvm@14
+        brew link llvm@15
         which clang
         clang --version
         brew install ${MACOS_BREW_PACKAGES}

CMakeLists.txt

@@ -1,14 +1,16 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.13)
 
 # Change the compiler BEFORE the first `project()` command to avoid an infinite loop.
 # See: https://public.kitware.com/pipermail/cmake/2009-November/033133.html
 if(APPLE)
-  # If custom llvm compilers are available, use them (for openmp support),
-  # otherwise disable multicore.
-  find_program(CLANG_CMD "clang" HINTS /usr/local/opt/llvm/bin)
-  if(CLANG_CMD)
-    set(CMAKE_C_COMPILER "clang")
-    set(CMAKE_CXX_COMPILER "clang++")
+  if (NOT DEFINED CMAKE_CXX_COMPILER)
+    # If custom llvm compilers are available, use them (for openmp support),
+    # otherwise disable multicore.
+    find_program(CLANG_CMD "clang" HINTS /usr/local/opt/llvm/bin)
+    if(CLANG_CMD)
+      set(CMAKE_C_COMPILER ${CLANG_CMD})
+      set(CMAKE_CXX_COMPILER ${CLANG_CMD}++)
+    endif()
   endif()
 endif()