diff --git a/CMakeLists.txt b/CMakeLists.txt index 6354b0ee..8b5b840b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,9 +35,7 @@ set(CAPNPROTO_CLANG_INCOMPATIBLE FALSE) # https://github.com/capnproto/capnproto/blob/master/security-advisories/2022-11-30-0-pointer-list-bounds.md # https://capnproto.org/news/2022-11-30-CVE-2022-46149-security-advisory.html # https://dwrensha.github.io/capnproto-rust/2022/11/30/out_of_bounds_memory_access_bug.html -if(CapnProto_VERSION STREQUAL "0.7.0" - OR CapnProto_VERSION STREQUAL "0.8.0" - OR CapnProto_VERSION STREQUAL "0.9.0" +if(CapnProto_VERSION STREQUAL "0.9.0" OR CapnProto_VERSION STREQUAL "0.9.1" OR CapnProto_VERSION STREQUAL "0.10.0" OR CapnProto_VERSION STREQUAL "0.10.1" diff --git a/cmake/compat_config.cmake b/cmake/compat_config.cmake index f9d3004f..32a9d6dd 100644 --- a/cmake/compat_config.cmake +++ b/cmake/compat_config.cmake @@ -15,45 +15,3 @@ endif() if (NOT DEFINED CAPNPC_OUTPUT_DIR) set(CAPNPC_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}") endif() - -# CMake target definitions for backwards compatibility with Ubuntu bionic -# capnproto 0.6.1 package (https://packages.ubuntu.com/bionic/libcapnp-dev) -# https://github.com/bitcoin-core/libmultiprocess/issues/27 - -if (NOT DEFINED CAPNP_LIB_CAPNPC AND DEFINED CAPNP_LIB_CAPNP-RPC) - string(REPLACE "-rpc" "c" CAPNP_LIB_CAPNPC "${CAPNP_LIB_CAPNP-RPC}") -endif() - -if (NOT DEFINED CapnProto_capnpc_IMPORTED_LOCATION AND DEFINED CapnProto_capnp-rpc_IMPORTED_LOCATION) - string(REPLACE "-rpc" "c" CapnProto_capnpc_IMPORTED_LOCATION "${CapnProto_capnp-rpc_IMPORTED_LOCATION}") -endif() - -if (NOT TARGET CapnProto::capnp AND DEFINED CAPNP_LIB_CAPNP) - add_library(CapnProto::capnp SHARED IMPORTED) - set_target_properties(CapnProto::capnp PROPERTIES IMPORTED_LOCATION "${CAPNP_LIB_CAPNP}") -endif() - -if (NOT TARGET CapnProto::capnpc AND DEFINED CAPNP_LIB_CAPNPC) - add_library(CapnProto::capnpc SHARED IMPORTED) - set_target_properties(CapnProto::capnpc PROPERTIES IMPORTED_LOCATION "${CAPNP_LIB_CAPNPC}") -endif() - -if (NOT TARGET CapnProto::capnpc AND DEFINED CapnProto_capnpc_IMPORTED_LOCATION) - add_library(CapnProto::capnpc SHARED IMPORTED) - set_target_properties(CapnProto::capnpc PROPERTIES IMPORTED_LOCATION "${CapnProto_capnpc_IMPORTED_LOCATION}") -endif() - -if (NOT TARGET CapnProto::capnp-rpc AND DEFINED CAPNP_LIB_CAPNP-RPC) - add_library(CapnProto::capnp-rpc SHARED IMPORTED) - set_target_properties(CapnProto::capnp-rpc PROPERTIES IMPORTED_LOCATION "${CAPNP_LIB_CAPNP-RPC}") -endif() - -if (NOT TARGET CapnProto::kj AND DEFINED CAPNP_LIB_KJ) - add_library(CapnProto::kj SHARED IMPORTED) - set_target_properties(CapnProto::kj PROPERTIES IMPORTED_LOCATION "${CAPNP_LIB_KJ}") -endif() - -if (NOT TARGET CapnProto::kj-async AND DEFINED CAPNP_LIB_KJ-ASYNC) - add_library(CapnProto::kj-async SHARED IMPORTED) - set_target_properties(CapnProto::kj-async PROPERTIES IMPORTED_LOCATION "${CAPNP_LIB_KJ-ASYNC}") -endif() diff --git a/shell.nix b/shell.nix index 1a4614e3..e04518f3 100644 --- a/shell.nix +++ b/shell.nix @@ -17,10 +17,6 @@ let }; }; capnprotoHashes = { - "0.7.0" = "sha256-Y/7dUOQPDHjniuKNRw3j8dG1NI9f/aRWpf8V0WzV9k8="; - "0.7.1" = "sha256-3cBpVmpvCXyqPUXDp12vCFCk32ZXWpkdOliNH37UwWE="; - "0.8.0" = "sha256-rfiqN83begjJ9eYjtr21/tk1GJBjmeVfa3C3dZBJ93w="; - "0.8.1" = "sha256-OZqNVYdyszro5rIe+w6YN00g6y8U/1b8dKYc214q/2o="; "0.9.0" = "sha256-yhbDcWUe6jp5PbIXzn5EoKabXiWN8lnS08hyfxUgEQ0="; "0.9.2" = "sha256-BspWOPZcP5nCTvmsDE62Zutox+aY5pw42d6hpH3v4cM="; "0.10.0" = "sha256-++F4l54OMTDnJ+FO3kV/Y/VLobKVRk461dopanuU3IQ=";