Merge branch 'develop' of https://github.com/febiosoftware/FEBio into…

… develop

CMakeLists.txt

@@ -136,6 +136,8 @@ if(WIN32)
     add_compile_options(/MP /wd4996 /wd4251 /wd4275)
 elseif(APPLE)
     set(CMAKE_BUILD_RPATH @executable_path/../lib/;@executable_path/../Frameworks)
+    set(OMP_INC "" CACHE PATH "Path to the OMP include directory")
+    mark_as_advanced(OMP_INC)
 else()
 	add_compile_options(-fopenmp -w)
 
@@ -326,6 +328,11 @@ else()
     endif()
 endif()
 
+# Manually pull in include dirs for OpenMP on macOS
+if(APPLE)
+    target_include_directories(febiomech PRIVATE ${OpenMP_C_INCLUDE_DIRS} ${OMP_INC})
+endif()
+
 # Link Pardiso-project
 if(USE_PDL)
     target_compile_definitions(numcore PRIVATE PARDISODL)

ci/macOS/cmake.sh

@@ -3,4 +3,5 @@ cmake . -B cmbuild -L \
 	-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
 	-DUSE_MMG=ON \
 	-DUSE_LEVMAR=ON \
-	-DUSE_HYPRE=ON
+	-DUSE_HYPRE=ON \
+    -DOMP_INC=/Users/gitRunner/local/x86_64/homebrew/opt/libomp/include