Skip to content

Commit eb516af

Browse files
committed
fixed toolbox dep
1 parent 37fc4fb commit eb516af

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

CMakeLists.txt

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.10)
22
project(minter_tx
3-
VERSION 0.5.0
3+
VERSION 0.5.1
44
DESCRIPTION "Minter Transaction Maker"
55
LANGUAGES CXX
66
)
@@ -63,10 +63,8 @@ else ()
6363
find_package(Boost 1.70.0 COMPONENTS exception REQUIRED)
6464
endif ()
6565

66-
add_library(CONAN_PKG::boost_exception INTERFACE IMPORTED)
67-
add_library(CONAN_PKG::boost_multiprecision INTERFACE IMPORTED)
68-
set_property(TARGET CONAN_PKG::boost_exception PROPERTY INTERFACE_LINK_LIBRARIES ${Boost_LIBRARIES})
69-
set_property(TARGET CONAN_PKG::boost_multiprecision PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
66+
add_library(CONAN_PKG::boost INTERFACE IMPORTED)
67+
set_property(TARGET CONAN_PKG::boost PROPERTY INTERFACE_LINK_LIBRARIES ${Boost_LIBRARIES})
7068

7169
# toolbox
7270
conan_fallback(NAME toolbox)
@@ -223,8 +221,7 @@ set(ENABLE_JNI OFF CACHE BOOL "secp256k1 shared" FORCE)
223221
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/secp256k1 ${CMAKE_BINARY_DIR}/secp256k1)
224222

225223
target_link_libraries(${PROJECT_NAME} secp256k1_core)
226-
target_link_libraries(${PROJECT_NAME} CONAN_PKG::boost_multiprecision)
227-
target_link_libraries(${PROJECT_NAME} CONAN_PKG::boost_exception)
224+
target_link_libraries(${PROJECT_NAME} CONAN_PKG::boost)
228225
target_link_libraries(${PROJECT_NAME} CONAN_PKG::bip39)
229226
target_link_libraries(${PROJECT_NAME} CONAN_PKG::toolbox)
230227

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ For more information, see official [docs](https://docs.conan.io/en/latest/gettin
5353
## Use as conan dependency without manually build
5454
You can just add to your conanfile.txt dependency:
5555

56-
`minter_tx/0.5.0@minter/latest`
56+
`minter_tx/0.5.1@minter/latest`
5757

5858
CMakeLists.txt
5959
```cmake

RELEASE.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Release notes
22

3+
## 0.5.1
4+
- Set boost version to 1.70 for compatibility
5+
36
## 0.5.0
47
- Checks support (with texasnet gas coin)
58
- Clean-up leading zeroes in signature

conanfile.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ class MinterTxConan(ConanFile):
5151
requires = (
5252
'bip39/2.0.0@edwardstock/latest',
5353
'toolbox/3.1.0@edwardstock/latest',
54-
'boost_multiprecision/1.69.0@bincrafters/stable',
55-
'boost_exception/1.69.0@bincrafters/stable',
54+
'boost/1.70.0@conan/stable',
5655
)
5756

5857
build_requires = (

version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5.0
1+
0.5.1

0 commit comments

Comments
 (0)