status-im
/
evmc
mirror of https://github.com/status-im/evmc.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #147 from ethereum/cable 

Upgrade Cable to 0.2.13
This commit is contained in:
Alex Beregszaszi 2018-09-06 13:18:46 +01:00 committed by GitHub
parent 2ac609dfba bff66a17c5
commit ae4a79a9b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/cable/CableCompilerSettings.cmake
View File

@ -35,7 +35,7 @@ macro(cable_configure_compiler)
cmake_parse_arguments(cable "NO_CONVERSION_WARNINGS;NO_STACK_PROTECTION" "" "" ${ARGN}) cmake_parse_arguments(cable "NO_CONVERSION_WARNINGS;NO_STACK_PROTECTION" "" "" ${ARGN})
if(cable_UNPARSED_ARGUMENTS) if(cable_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "cable_configure_compiler: Uknown options: ${cable_UNPARSED_ARGUMENTS}") message(FATAL_ERROR "cable_configure_compiler: Unknown options: ${cable_UNPARSED_ARGUMENTS}")
endif() endif()
# Set helper variables recognizing C++ compilers. # Set helper variables recognizing C++ compilers.

8
cmake/cable/bootstrap.cmake
View File

@ -8,11 +8,11 @@
# Cable version. # Cable version.
# #
# This is internal variable automaticaly updated with external tools. # This is internal variable automatically updated with external tools.
# Use CABLE_VERSION variable if you need this information. # Use CABLE_VERSION variable if you need this information.
set(version 0.2.11) set(version 0.2.13)
# For conveniance, add the project CMake module dir to module path. # For convenience, add the project CMake module dir to module path.
set(module_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(module_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
if(EXISTS ${module_dir}) if(EXISTS ${module_dir})
list(APPEND CMAKE_MODULE_PATH ${module_dir}) list(APPEND CMAKE_MODULE_PATH ${module_dir})
@ -24,7 +24,7 @@ if(CABLE_VERSION)
# Compare versions of the top project and this instances. # Compare versions of the top project and this instances.
if(CABLE_VERSION VERSION_LESS version) if(CABLE_VERSION VERSION_LESS version)
set(severity WARNING) set(severity WARNING)
set(comment "vesion older than ${version}") set(comment "version older than ${version}")
elseif(CABLE_VERSION VERSION_EQUAL version) elseif(CABLE_VERSION VERSION_EQUAL version)
set(severity STATUS) set(severity STATUS)
set(comment "same version") set(comment "same version")

2
cmake/cable/buildinfo/gitinfo.cmake
View File

@ -5,7 +5,7 @@
# Execute git only if the tool is available. # Execute git only if the tool is available.
if(GIT) if(GIT)
execute_process( execute_process(
COMMAND ${GIT} describe --always --long --tags --match=v* --abbrev=40 --dirty COMMAND ${GIT} describe --always --long --tags --first-parent --match=v* --abbrev=40 --dirty
WORKING_DIRECTORY ${SOURCE_DIR} WORKING_DIRECTORY ${SOURCE_DIR}
OUTPUT_VARIABLE gitinfo OUTPUT_VARIABLE gitinfo
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE