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 #251 from ethereum/upgrade-cable 

Upgrade Cable to 0.2.17
This commit is contained in:
Paweł Bylica 2019-04-24 19:40:09 +02:00 committed by GitHub
parent e3eae5e49f cb11b4fc69
commit f064cf690e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/cable/CableBuildInfo.cmake
View File

@ -1,18 +1,19 @@
# Cable: CMake Bootstrap Library. # Cable: CMake Bootstrap Library.
# Copyright 2018 Pawel Bylica. # Copyright 2019 Pawel Bylica.
# Licensed under the Apache License, Version 2.0. See the LICENSE file. # Licensed under the Apache License, Version 2.0.
if(cable_build_info_included) if(cable_build_info_included)
return() return()
endif() endif()
set(cable_build_info_included TRUE) set(cable_build_info_included TRUE)
include(GNUInstallDirs)
set(cable_buildinfo_template_dir ${CMAKE_CURRENT_LIST_DIR}/buildinfo) set(cable_buildinfo_template_dir ${CMAKE_CURRENT_LIST_DIR}/buildinfo)
function(cable_add_buildinfo_library) function(cable_add_buildinfo_library)
cmake_parse_arguments("" "" PROJECT_NAME "" ${ARGN}) cmake_parse_arguments("" "" PROJECT_NAME;EXPORT "" ${ARGN})
if(NOT _PROJECT_NAME) if(NOT _PROJECT_NAME)
message(FATAL_ERROR "The PROJECT_NAME argument missing") message(FATAL_ERROR "The PROJECT_NAME argument missing")
@ -85,4 +86,13 @@ function(cable_add_buildinfo_library)
LIBRARY_OUTPUT_DIRECTORY ${output_dir} LIBRARY_OUTPUT_DIRECTORY ${output_dir}
ARCHIVE_OUTPUT_DIRECTORY ${output_dir} ARCHIVE_OUTPUT_DIRECTORY ${output_dir}
) )
if(_EXPORT)
install(TARGETS ${name} EXPORT ${_EXPORT}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
endif()
endfunction() endfunction()

6
cmake/cable/bootstrap.cmake
View File

@ -1,6 +1,6 @@
# Cable: CMake Bootstrap Library. # Cable: CMake Bootstrap Library.
# Copyright 2018 Pawel Bylica. # Copyright 2019 Pawel Bylica.
# Licensed under the Apache License, Version 2.0. See the LICENSE file. # Licensed under the Apache License, Version 2.0.
# Bootstrap the Cable - CMake Bootstrap Library by including this file. # Bootstrap the Cable - CMake Bootstrap Library by including this file.
# e.g. include(cmake/cable/bootstrap.cmake). # e.g. include(cmake/cable/bootstrap.cmake).
@ -10,7 +10,7 @@
# #
# This is internal variable automatically 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.16) set(version 0.2.17)
# For convenience, 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)