Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qtils error #19

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@ env:
jobs:
MacOS:
runs-on: macos-latest
runs-on: macos-13
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: ${{ env.CACHE_PATHS }}
key: ${{ github.job }}-${{ env.CACHE_VERSION }}
- name: build
env:
DEVELOPER_DIR: /Applications/Xcode_13.3.app/Contents/Developer
run: ./scripts/build.sh

Linux:
Expand All @@ -53,7 +51,7 @@ jobs:
clang-tidy:
name: "Linux: clang-tidy"
runs-on: ubuntu-latest
container: soramitsu/kagome-dev:2-minideb
container: qdrvm/kagome-dev@sha256:14d5aa92c971073e82ba9bbac9b615701e99c71f64e58bdd45e5b3dbc09944bd
steps:
- uses: actions/checkout@v2
with:
Expand Down
16 changes: 12 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@

cmake_minimum_required(VERSION 3.12)

if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.27")
cmake_policy(SET CMP0144 NEW)
endif()

include(${CMAKE_CURRENT_LIST_DIR}/cmake/HunterGate.cmake)

HunterGate(
URL https://github.com/qdrvm/hunter/archive/refs/tags/v0.23.257-qdrvm10.tar.gz
SHA1 72b446a4424ba28ea90f9a68a9134b0f8e44b5b2
URL https://github.com/qdrvm/hunter/archive/refs/heads/turuslan/qtils.zip
SHA1 9f5aee42751b243f847dec0a8b6f0352a99a5611
)

project(Scale LANGUAGES CXX VERSION 1.1.0)
Expand All @@ -25,12 +29,16 @@ option(BUILD_TESTS "Whether to include the test suite in build" OFF)

hunter_add_package(Boost)
find_package(Boost CONFIG REQUIRED)
hunter_add_package(fmt)
find_package(fmt CONFIG REQUIRED)
hunter_add_package(qtils)
find_package(qtils CONFIG REQUIRED)

add_subdirectory(src)

if (BUILD_TESTS)
enable_testing()
add_subdirectory(test ${CMAKE_BINARY_DIR}/tests_bin)
add_subdirectory(test ${CMAKE_BINARY_DIR}/test_bin)
endif ()

###############################################################################
Expand All @@ -39,7 +47,7 @@ endif ()

include(GNUInstallDirs)

install(TARGETS scale scale_encode_append EXPORT scaleConfig
install(TARGETS scale EXPORT scaleConfig
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
Expand Down
4 changes: 2 additions & 2 deletions cmake/HunterGate.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# This is a gate file to Hunter package manager.
# Include this file using `include` command and add package you need, example:
#
# cmake_minimum_required(VERSION 3.2)
# cmake_minimum_required(VERSION 3.5)
#
# include("cmake/HunterGate.cmake")
# HunterGate(
Expand Down Expand Up @@ -257,7 +257,7 @@ function(hunter_gate_download dir)
file(
WRITE
"${cmakelists}"
"cmake_minimum_required(VERSION 3.2)\n"
"cmake_minimum_required(VERSION 3.5)\n"
"project(HunterDownload LANGUAGES NONE)\n"
"include(ExternalProject)\n"
"ExternalProject_Add(\n"
Expand Down
118 changes: 0 additions & 118 deletions include/scale/detail/variant.hpp

This file was deleted.

4 changes: 3 additions & 1 deletion include/scale/encode_append.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

#pragma once

#include <scale/scale.hpp>
#include <qtils/outcome.hpp>

#include <scale/types.hpp>

namespace scale {

Expand Down
120 changes: 0 additions & 120 deletions include/scale/outcome/outcome-register.hpp

This file was deleted.

37 changes: 0 additions & 37 deletions include/scale/outcome/outcome.hpp

This file was deleted.

Loading
Loading