sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove the clang specifics in cmake and

Browse source 
use the default XCode
This commit is contained in:
Paul Fd 2020-03-11 11:32:18 +01:00
parent b44b4efad3
commit dc25c5282e
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -129,7 +129,6 @@ jobs:
- name: "macOS" - name: "macOS"
os: osx os: osx
osx_image: xcode10.1
env: env:
- INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}" - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}"
install: .travis/install_osx.sh install: .travis/install_osx.sh

7
cmake/SfizzConfig.cmake
View file

@ -1,10 +1,3 @@
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND (CMAKE_CXX_STANDARD LESS 14 OR NOT CMAKE_CXX_STANDARD))
# There is a strange segfault in clang in c++11 when instantiating the
# envelopes in FloatEnvelopes.cpp.
message("Forcing C++14 to bypass a clang segfault")
set(CMAKE_CXX_STANDARD 14)
endif()
# Do not override the C++ standard if set to more than 11 # Do not override the C++ standard if set to more than 11
if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 11) if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 11)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)