Merge pull request #587 from ryuichis/big-sur

macOS Big Sur Support
oclint · Nov 15, 2020 · dcb0135 · dcb0135
2 parents 4bf5d31 + 1c4b5d2
commit dcb0135
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,64 +1,51 @@
 language: cpp
 
-matrix:
+jobs:
  include:
  - os: linux
  dist: focal
- sudo: required
  env: BUILD="test" MODULE="core"
  - os: linux
  dist: focal
- sudo: required
  env: BUILD="test" MODULE="metrics"
  - os: linux
  dist: focal
- sudo: required
  env: BUILD="test" MODULE="rules" DEP="core metrics"
  - os: linux
  dist: focal
- sudo: required
  env: BUILD="test" MODULE="reporters" DEP="core"
  - os: linux
  dist: focal
- sudo: required
  env: BUILD="test" MODULE="driver" DEP="core"
  - os: linux
  dist: focal
- sudo: required
  env: BUILD="build"
  - os: linux
  dist: focal
- sudo: required
  env: BUILD="docgen"
  - os: linux
  arch: arm64
  dist: focal
- sudo: required
  env: BUILD="test" MODULE="core"
  - os: linux
  arch: arm64
  dist: focal
- sudo: required
  env: BUILD="test" MODULE="metrics"
  # - os: linux
  # arch: arm64
  # dist: focal
- # sudo: required
  # env: BUILD="test" MODULE="rules" DEP="core metrics"
  - os: linux
  arch: arm64
  dist: focal
- sudo: required
  env: BUILD="test" MODULE="reporters" DEP="core"
  - os: linux
  arch: arm64
  dist: focal
- sudo: required
  env: BUILD="test" MODULE="driver" DEP="core"
  # - os: linux
  # arch: arm64
  # dist: focal
- # sudo: required
  # env: BUILD="build"
  - os: osx
  osx_image: xcode12.2

diff --git a/oclint-core/cmake/OCLintConfig.cmake b/oclint-core/cmake/OCLintConfig.cmake
@@ -19,8 +19,8 @@ ELSE()
 ENDIF()
 
 IF(APPLE)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden -mmacosx-version-min=10.14")
- SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -mmacosx-version-min=10.14")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden -mmacosx-version-min=10.15")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -mmacosx-version-min=10.15")
 ENDIF()
 
 IF(OCLINT_BUILD_TYPE STREQUAL "Release")