Skip to content

Commit

Permalink
removed vanilla clang for time being
Browse files Browse the repository at this point in the history
  • Loading branch information
sfarrens committed Jul 8, 2019
1 parent f77746d commit 484256a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
11 changes: 0 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 1 addition & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 484256a

Please sign in to comment.