gh: handle apple clang search paths

madMatchstick · Mar 14, 2024 · 2135da4 · 2135da4
1 parent 69812e3
commit 2135da4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/actions/ngen-build/action.yaml b/.github/actions/ngen-build/action.yaml
@@ -86,7 +86,6 @@ runs:
               echo "LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH" >> $GITHUB_ENV
               echo "LDFLAGS=-L/usr/local/lib" >> $GITHUB_ENV
               echo "LIB=$LD_LIBRARY_PATH" >> $GITHUB_ENV
-              echo "INCLUDE=/usr/local/include" >> $GITHUB_ENV
               echo "NETCDF=/usr/local" >> $GITHUB_ENV
             fi
           shell: bash
@@ -171,6 +170,13 @@ runs:
           run: echo "FC=gfortran-13" >> $GITHUB_ENV
           shell: bash
 
+        - name: Setup macOS Default Compiler Includes
+          if: runner.os == 'macOS'
+          run: |
+            echo "C_INCLUDE_PATH=/usr/local/include" >> $GITHUB_ENV
+            echo "CPLUS_INCLUDE_PATH=/usr/local/include" >> $GITHUB_ENV
+          shell: bash
+
         - name: Cmake Initialization
           id: cmake_init
           run: |

diff --git a/include/core/mediator/UnitsHelper.hpp b/include/core/mediator/UnitsHelper.hpp
@@ -8,10 +8,10 @@
 //        See PR #725 for context on this issue.
 
 #if defined(__has_include)
-#  if __has_include(<udunits2.h>)
-#    include <udunits2.h>
-#  elif __has_include(<udunits2/udunits2.h>)
+#  if __has_include(<udunits2/udunits2.h>)
 #    include <udunits2/udunits2.h>
+#  else
+#    include <udunits2.h>
 #  endif
 #else
 #  include <udunits2.h>