cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4560 from ethereum/cmake-policy

Browse Source 
CMake policies
This commit is contained in:
Alex Beregszaszi 2018-08-02 13:32:32 +01:00 committed by GitHub
commit f7c96c8dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/EthCompilerSettings.cmake
View File

@ -146,9 +146,6 @@ endif ()
if (SANITIZE) if (SANITIZE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=${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() endif()
# Code coverage support. # Code coverage support.

24
cmake/EthPolicy.cmake
View File

@ -4,32 +4,16 @@ macro (eth_policy)
# link_directories() treats paths relative to the source dir. # link_directories() treats paths relative to the source dir.
cmake_policy(SET CMP0015 NEW) cmake_policy(SET CMP0015 NEW)
# let cmake autolink dependencies on windows # Avoid warnings in CMake 3.0.2:
cmake_policy(SET CMP0020 NEW) 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)
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() # allow VERSION argument in project()
cmake_policy(SET CMP0048 NEW) cmake_policy(SET CMP0048 NEW)
endif() if (POLICY CMP0054)
if (${CMAKE_VERSION} VERSION_GREATER 3.1)
# do not interpret if() arguments as variables! # do not interpret if() arguments as variables!
cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0054 NEW)
endif() endif()
endmacro() endmacro()