find-openmp-version

.github/workflows/build-and-test.yaml

@@ -44,8 +44,8 @@ jobs:
         run: |
           # libomp is installed as keg-only, so we need to manually point to it
           HOMEBREW_LIBOMP_PREFIX=`brew --prefix libomp`
-          OMP_FLAGS="-Xprocessor;-fopenmp"
-          echo "EXTRA_CMAKE_ARGS=-DOpenMP_C_FLAGS=\"$OMP_FLAGS\" -DOpenMP_C_LIB_NAMES=omp -DOpenMP_CXX_FLAGS=\"$OMP_FLAGS\" -DOpenMP_CXX_LIB_NAMES=omp -DOpenMP_omp_LIBRARY=$HOMEBREW_LIBOMP_PREFIX/lib/libomp.dynlib" >> "$GITHUB_ENV"
+          OMP_FLAGS="-Xprocessor;-fopenmp;-I${HOMEBREW_LIBOMP_PREFIX}/include"
+          echo "EXTRA_CMAKE_ARGS=-DOpenMP_C_FLAGS=\"$OMP_FLAGS\" -DOpenMP_C_LIB_NAMES=omp -DOpenMP_CXX_FLAGS=\"$OMP_FLAGS\" -DOpenMP_CXX_LIB_NAMES=omp -DOpenMP_omp_LIBRARY=$HOMEBREW_LIBOMP_PREFIX/lib/libomp.dynlib -DCMAKE_PATH_PREFIX=$HOMEBREW_LIBOMP_PREFIX" >> "$GITHUB_ENV"
 
       - name: Configure
         run: |

CMakeLists.txt

@@ -196,11 +196,19 @@ macro(find_openmp)
 		#   and OpenMP_<lang>_LIBRARIES/LIBRARY/LIB_NAMES variables
 		# This is important for Intel compilers in particular, which require
 		# additional linking
+		message(STATUS "OpenMP VERSION/version/cxx_version/CXX_SPEC_DATE/cxx_spec_date: ${OPENMP_VERSION} / ${OpenMP_VERSION} / ${OpenMP_CXX_VERSION} / ${OPENMP_CXX_SPEC_DATE} / ${OpenMP_CXX_SPEC_DATE}")
 		if ((DECLARED OPENMP_VERSION) AND (NOT OPENMP_VERSION VERSION_LESS 2.0))
 			set(SHARK_OPENMP ON)
+		elseif((DECLARED OpenMP_VERSION) AND (NOT OpenMP_VERSION VERSION_LESS 2.0))
+			set(SHARK_OPENMP ON)
+		elseif((DECLARED OpenMP_CXX_VERSION) AND (NOT OpenMP_CXX_VERSION VERSION_LESS 2.0))
+			set(SHARK_OPENMP ON)
 		elseif((DECLARED OPENMP_CXX_SPEC_DATE) AND (NOT OPENMP_CXX_SPEC_DATE LESS 200203))
 			set(SHARK_OPENMP ON)
+		elseif((DECLARED OpenMP_CXX_SPEC_DATE) AND (NOT OpenMP_CXX_SPEC_DATE LESS 200203))
+			set(SHARK_OPENMP ON)
 		else()
+
 			set(OPENMP_VERSION_CHECK_SOURCE "
 #include <stdio.h>
 int main(int argc, char *argv[]) {