diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b57797b..a9e234a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,10 +40,6 @@ jobs: name: install OpenMP run: sudo apt-get install -y libomp-dev - - if: matrix.os == 'macos-latest' - name: install OpenMP - run: brew install libomp - - name: Configure CMake run: > cmake -B build diff --git a/CMakeLists.txt b/CMakeLists.txt index 46b219a..bbaa0da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) set(IDE_FOLDER "") # Declare project -project(${META_PROJECT_NAME} VERSION ${META_VERSION} DESCRIPTION ${META_PROJECT_DESCRIPTION} LANGUAGES C CXX) +project(${META_PROJECT_NAME} VERSION ${META_VERSION} DESCRIPTION ${META_PROJECT_DESCRIPTION} LANGUAGES CXX) # Set output directories set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) diff --git a/source/girgs/CMakeLists.txt b/source/girgs/CMakeLists.txt index 045793b..0a361a6 100644 --- a/source/girgs/CMakeLists.txt +++ b/source/girgs/CMakeLists.txt @@ -11,9 +11,12 @@ find_package(OpenMP) # manually sets the required fields for clang-like compiler. if(NOT OpenMP_FOUND) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") + message(STATUS "try appleclang fallback") # This will find default libomp-installations for homebrew/MacPorts find_library(LIBOMP_PATH NAMES omp PATHS "/usr/local/opt/libomp/lib" "/opt/local/lib/libomp" "/opt/homebrew/opt/libomp/lib") find_path(LIBOMP_INCLUDE NAMES omp.h PATHS "/usr/local/opt/libomp/include" "/opt/local/include/libomp" "/opt/homebrew/opt/libomp/include") + message(STATUS "{LIBOMP_PATH}") + message(STATUS "{LIBOMP_INCLUDE}") if(LIBOMP_PATH AND LIBOMP_INCLUDE) set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I${LIBOMP_INCLUDE}" CACHE STRING "Manually set" FORCE) set(OpenMP_CXX_LIB_NAMES "omp" CACHE STRING "Manually set" FORCE)