status-im/evmc
2
0
Fork 0
mirror of https://github.com/status-im/evmc.git synced 2025-02-22 07:58:19 +00:00
Code Issues Projects Releases Wiki Activity

cmake: Do not set default toolchain file

Browse Source
This commit is contained in:
Paweł Bylica 2019-11-28 21:02:04 +01:00
parent 01af41fad9
commit 180f94510d
No known key found for this signature in database
GPG Key ID: 7A0C037434FE77EF
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -16,9 +16,8 @@ endif()
include(cmake/cable/bootstrap.cmake)
include(CableBuildType)
include(CableCompilerSettings)
include(CMakeDependentOption)
include(CablePackage)
include(CableToolchains)
include(CMakeDependentOption)
include(CMakePackageConfigHelpers)
include(GNUInstallDirs)
@ -41,7 +40,6 @@ if(HUNTER_ENABLED)
include(defaults/HunterCacheServers)
endif()
cable_configure_toolchain(DEFAULT cxx11-pic)
cable_set_build_type(DEFAULT Release CONFIGURATION_TYPES Debug Release)
project(evmc)

8
circle.yml
View File

@ -153,7 +153,7 @@ jobs:
docker:
- image: ethereum/cpp-build-env:12-gcc-8
environment:
CMAKE_OPTIONS: -DTOOLCHAIN=cxx17-pic
CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=17
steps:
- build_and_test
@ -161,7 +161,7 @@ jobs:
docker:
- image: ethereum/cpp-build-env:12-gcc-9
environment:
CMAKE_OPTIONS: -DTOOLCHAIN=cxx17-pic -DSANITIZE=undefined
CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=17 -DSANITIZE=undefined
steps:
- build_and_test
@ -169,7 +169,7 @@ jobs:
docker:
- image: ethereum/cpp-build-env:12-clang-9
environment:
CMAKE_OPTIONS: -DTOOLCHAIN=cxx14-pic -DSANITIZE=address
CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=14 -DSANITIZE=address
UBSAN_OPTIONS: halt_on_error=1
steps:
- build_and_test
@ -196,7 +196,7 @@ jobs:
docker:
- image: ethereum/cpp-build-env:12-base
environment:
CMAKE_OPTIONS: -DTOOLCHAIN=cxx11-32bit
CMAKE_OPTIONS: -DCMAKE_TOOLCHAIN_FILE=~/project/cmake/cable/toolchains/cxx11-32bit.cmake
steps:
- run:
name: "Install GCC 32-bit"