Updated CMakeLists and macOS cmake CI script to find omp.h

Author: michaelrossherron

CMakeLists.txt

@@ -288,7 +288,8 @@ endif()
 if(UNIX)
     option(USE_MKL_OMP "Link to MKL OMP instead of System OMP" OFF)
     set(MKL_OMP "" CACHE PATH "Path to the MKL OMP library")
-    mark_as_advanced(USE_MKL_OMP MKL_OMP)
+    set(OMP_INC "" CACHE PATH "Path to the OMP include directory")
+    mark_as_advanced(USE_MKL_OMP MKL_OMP OMP_INC)
 endif()
 
 ##### Set appropriate defines and includes #####
@@ -524,8 +525,10 @@ endif()
 if(UNIX)
     if(${USE_MKL_OMP})
         target_link_libraries(${FBS_BIN_NAME} ${MKL_OMP})
+        target_include_directories(RTLib PRIVATE ${OpenMP_C_INCLUDE_DIRS} ${OMP_INC})
     else()
         target_link_libraries(${FBS_BIN_NAME} ${OpenMP_C_LIBRARIES})
+        target_include_directories(RTLib PRIVATE ${OpenMP_C_INCLUDE_DIRS} ${OMP_INC})
     endif()
 endif()
 

ci/macOS/cmake.sh

@@ -12,7 +12,10 @@ run_cmake() {
 		-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
 		-DCMAKE_OSX_ARCHITECTURES=x86_64 \
 		-DBUILD_UPDATER=ON \
-		-DHOMEBREW=ON
+		-DHOMEBREW=ON \
+        -DUSE_MKL_OMP=ON \
+        -DMKL_OMP=/opt/intel/oneapi/compiler/latest/mac/compiler/lib/libiomp5.dylib \
+        -DOMP_INC=/Users/gitRunner/local/x86_64/homebrew/opt/libomp/include
 }