diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-08-02 20:32:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 20:32:32 +0800 |
| commit | f7c96c8dee43652e5c9c52078db524c27bc29aec (patch) | |
| tree | d63a2eb5d48432c0f7446b7c2ea78764c2223736 /cmake | |
| parent | 68f9128475d75cf6b5c6f4bab79673455e36eaa3 (diff) | |
| parent | 1a64dd1d71d0f75becaccc44ad3cd68a45bef510 (diff) | |
| download | dexon-solidity-f7c96c8dee43652e5c9c52078db524c27bc29aec.tar.gz dexon-solidity-f7c96c8dee43652e5c9c52078db524c27bc29aec.tar.zst dexon-solidity-f7c96c8dee43652e5c9c52078db524c27bc29aec.zip | |
Merge pull request #4560 from ethereum/cmake-policy
CMake policies
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/EthCompilerSettings.cmake | 3 | ||||
| -rw-r--r-- | cmake/EthPolicy.cmake | 28 |
2 files changed, 6 insertions, 25 deletions
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake index ee8cb1b3..515057fa 100644 --- a/cmake/EthCompilerSettings.cmake +++ b/cmake/EthCompilerSettings.cmake @@ -146,9 +146,6 @@ endif () if (SANITIZE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=${SANITIZE}") - if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/sanitizer-blacklist.txt") - endif() endif() # Code coverage support. diff --git a/cmake/EthPolicy.cmake b/cmake/EthPolicy.cmake index 31b09f15..4e29898c 100644 --- a/cmake/EthPolicy.cmake +++ b/cmake/EthPolicy.cmake @@ -4,32 +4,16 @@ macro (eth_policy) # link_directories() treats paths relative to the source dir. cmake_policy(SET CMP0015 NEW) - # let cmake autolink dependencies on windows - cmake_policy(SET CMP0020 NEW) + # Avoid warnings in CMake 3.0.2: + cmake_policy(SET CMP0042 NEW) + cmake_policy(SET CMP0043 NEW) - # CMake 2.8.12 and lower allowed the use of targets and files with double - # colons in target_link_libraries, - cmake_policy(SET CMP0028 OLD) + # allow VERSION argument in project() + cmake_policy(SET CMP0048 NEW) - if (${CMAKE_VERSION} VERSION_GREATER 3.0) - - # fix MACOSX_RPATH - cmake_policy(SET CMP0042 OLD) - - # ignore COMPILE_DEFINITIONS_<Config> properties - cmake_policy(SET CMP0043 OLD) - - # allow VERSION argument in project() - cmake_policy(SET CMP0048 NEW) - - endif() - - if (${CMAKE_VERSION} VERSION_GREATER 3.1) - + if (POLICY CMP0054) # do not interpret if() arguments as variables! cmake_policy(SET CMP0054 NEW) - endif() - endmacro() |