Merge pull request #626 from ethereum/cable

Upgrade Cable modules
ethereum · Feb 12, 2022 · a79dced · a79dced
2 parents 669fcfb + cb090ff
commit a79dced
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 487 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ if(TARGET evmc)
     return()
 endif()
 
-include(cmake/cable/bootstrap.cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cable)
 include(CableBuildType)
 include(CableCompilerSettings)
 include(CablePackage)

diff --git a/cmake/cable/.gitignore b/cmake/cable/.gitignore
diff --git a/cmake/cable/CableBuildInfo.cmake b/cmake/cable/CableBuildInfo.cmake
diff --git a/cmake/cable/CableBuildType.cmake b/cmake/cable/CableBuildType.cmake
@@ -1,12 +1,19 @@
 # Cable: CMake Bootstrap Library <https://github.com/ethereum/cable>
-# Copyright 2018-2019 Pawel Bylica.
+# Copyright 2018 Pawel Bylica.
 # Licensed under the Apache License, Version 2.0.
 
-# Cable Build Type, version 1.0.0
+# Cable Build Type, version 1.0.1
 #
 # This CMake module helps with setting default build type
 # and build configurations for multi-configuration generators.
 # Use cable_set_build_type().
+#
+# CHANGELOG
+#
+# 1.0.1 - 2021-05-20
+# - Fix usage in CMake sub-project.
+#
+# 1.0.0 - 2020-01-02
 
 
 if(cable_build_type_included)
@@ -42,7 +49,7 @@ macro(cable_set_build_type)
             endif()
             message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
         endif()
-    elseif(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)  # After the main project().
+    elseif(PROJECT_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)  # After the main project().
         message(FATAL_ERROR "cable_set_build_type() must be used before project()")
     endif()  # Sub-project - silently ignore.
 endmacro()
diff --git a/cmake/cable/CableToolchains.cmake b/cmake/cable/CableToolchains.cmake
diff --git a/cmake/cable/bootstrap.cmake b/cmake/cable/bootstrap.cmake
diff --git a/cmake/cable/buildinfo/buildinfo.c.in b/cmake/cable/buildinfo/buildinfo.c.in
diff --git a/cmake/cable/buildinfo/buildinfo.cmake b/cmake/cable/buildinfo/buildinfo.cmake
diff --git a/cmake/cable/buildinfo/buildinfo.h.in b/cmake/cable/buildinfo/buildinfo.h.in