cmake: Do not set CMAKE_BUILD_TYPE, remove Cable

chfast · Apr 3, 2023 · 8ce526a · 8ce526a
1 parent 09fa9cf
commit 8ce526a
Show file tree

Hide file tree

Showing 34 changed files with 6 additions and 918 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,15 +4,12 @@
 
 cmake_minimum_required(VERSION 3.16.2...3.25)
 
-include(cmake/cable/bootstrap.cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-include(CableBuildType)
 include(CableCompilerSettings)
 include(CMakeDependentOption)
 include(CMakePackageConfigHelpers)
 
-cable_set_build_type(DEFAULT Release CONFIGURATION_TYPES Release RelWithDebInfo Debug)
-
 option(ETHASH_INSTALL_CMAKE_CONFIG "Install CMake configuration scripts for find_package(CONFIG)" ON)
 option(ETHASH_BUILD_ETHASH "Build ethash::ethash library (if NO only ethash::keccak is built)" YES)
 cmake_dependent_option(ETHASH_BUILD_GLOBAL_CONTEXT "Build ethash::global-context library" YES "ETHASH_BUILD_ETHASH" NO)

diff --git a/circle.yml b/circle.yml
@@ -162,7 +162,7 @@ jobs:
       - image: ethereum/cpp-build-env:19-gcc-12-multilib
     environment:
       - BUILD_TYPE: RelWithDebInfo
-      - CMAKE_OPTIONS: -DCMAKE_TOOLCHAIN_FILE=cmake/cable/toolchains/cxx14-32bit.cmake -DSANITIZE=address
+      - CMAKE_OPTIONS: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/32bit.cmake -DSANITIZE=address
       - TESTS_EXCLUDE: _oom
       - ASAN_OPTIONS: allocator_may_return_null=1
     steps:
@@ -177,7 +177,7 @@ jobs:
     environment:
       - TESTS_EXCLUDE: _oom|_multithreaded
       - BUILD_TYPE: Coverage
-      - CMAKE_OPTIONS: -DCMAKE_TOOLCHAIN_FILE=cmake/cable/toolchains/powerpc64.cmake -DCMAKE_EXE_LINKER_FLAGS=-static
+      - CMAKE_OPTIONS: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/powerpc64.cmake -DCMAKE_EXE_LINKER_FLAGS=-static
     steps:
       - checkout
       - install-powerpc64

diff --git a/cmake/cable/CableCompilerSettings.cmake → cmake/CableCompilerSettings.cmake b/cmake/cable/CableCompilerSettings.cmake → cmake/CableCompilerSettings.cmake
diff --git a/cmake/cable/HunterGate.cmake → cmake/HunterGate.cmake b/cmake/cable/HunterGate.cmake → cmake/HunterGate.cmake
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
diff --git a/cmake/cable/CablePackage.cmake b/cmake/cable/CablePackage.cmake
diff --git a/cmake/cable/CableToolchains.cmake b/cmake/cable/CableToolchains.cmake