Skip to content

Commit 5d9161a

Browse files
committed
Merge branch 'feature/enum-codecs' of github.com:soramitsu/scale-codec-cpp into feature/enum-codecs
2 parents 0d5490d + 71d5bff commit 5d9161a

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ cmake_minimum_required(VERSION 3.12)
88
include(${CMAKE_CURRENT_LIST_DIR}/cmake/HunterGate.cmake)
99
set(HUNTER_STATUS_DEBUG ON)
1010
HunterGate(
11-
URL https://github.com/soramitsu/soramitsu-hunter/archive/9ca72322e8d9de70d360dc7f371b223d32999123.zip
12-
SHA1 37cc1150526fb9c5dcf197f918e5d9aab611823f
11+
URL https://github.com/soramitsu/soramitsu-hunter/archive/tags/v0.23.257-soramitsu17.tar.gz
12+
SHA1 c7ccd337314b27485b75d0f0f5d5b42e7e3c2629
1313
)
1414

1515
project(Scale LANGUAGES CXX VERSION 1.0.0)

include/scale/detail/fixed_width_integer.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,6 @@ namespace scale::detail {
101101
I sv = -static_cast<I>((~v) + 1);
102102
return sv;
103103
}
104-
} // namespace scale::detail
104+
} // namespace scale::detail
105105

106-
#endif // SCALE_SCALE_UTIL_HPP
106+
#endif // SCALE_SCALE_UTIL_HPP

test/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ endif ()
1010

1111
hunter_add_package(GTest)
1212
find_package(GTest CONFIG REQUIRED)
13-
find_package(GMock CONFIG REQUIRED)
1413

1514
function(disable_clang_tidy target)
1615
set_target_properties(${target} PROPERTIES
@@ -25,8 +24,8 @@ function(addtest test_name)
2524
${ARGN}
2625
)
2726
target_link_libraries(${test_name}
28-
GTest::main
29-
GMock::main
27+
GTest::gtest
28+
GTest::gmock_main
3029
)
3130
target_include_directories(${test_name} PRIVATE
3231
${PROJECT_SOURCE_DIR}/include

0 commit comments

Comments
 (0)