diff --git a/.travis.yml b/.travis.yml index 8040ad3..dec57ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,17 +27,6 @@ matrix: packages: - gcc@7 - *macos_packages - - os: osx - name: "macOS with vanilla Clang" - osx_image: xcode10.2 - env: - - MATRIX_EVAL="CC=/usr/local/opt/llvm/bin/clang && CXX=/usr/local/opt/llvm/bin/clang++" - addons: - homebrew: - packages: - - llvm - - libomp - - *macos_packages - os: osx name: "macOS with AppleClang" osx_image: xcode10.2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c544c9..edd15ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,15 +23,7 @@ project(sparse2d) endif() message(STATUS "Installing to: ${CMAKE_INSTALL_PREFIX}") - # Find OpenMP - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(OpenMP_CXX "${CMAKE_CXX_COMPILER}") - set(OpenMP_CXX_FLAGS "-fopenmp=libomp -Wno-unused-command-line-argument") - set(OpenMP_CXX_LIB_NAMES "libomp" "libgomp" "libiomp5") - set(OpenMP_libomp_LIBRARY ${OpenMP_CXX_LIB_NAMES}) - set(OpenMP_libgomp_LIBRARY ${OpenMP_CXX_LIB_NAMES}) - set(OpenMP_libiomp5_LIBRARY ${OpenMP_CXX_LIB_NAMES}) - elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") set(OpenMP_INCLUDE_PATH "/usr/local/include") set(OpenMP_LIB_PATH "/usr/local/lib") set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -lomp")