Skip to content

Commit e83445a

Browse files
committed
using single boost lib 1.70
1 parent c6d6364 commit e83445a

File tree

6 files changed

+8
-34
lines changed

6 files changed

+8
-34
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- conan-dir-{{ checksum "conanfile.txt" }}-{{ checksum "conanfile.py" }}
4040
- run: conan install gtest/1.8.1@bincrafters/stable
4141
- run: conan install toolboxpp/2.2.0@scatter/latest
42-
- run: conan install boost_multiprecision/1.69.0@bincrafters/stable
42+
- run: conan install boost/1.70.0@conan/stable
4343
- run:
4444
name: Configuring
4545
command: conan remove --locks && cd _build && cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_TEST=ON

CMakeLists.txt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.10)
22
project(minter
3-
VERSION 0.1.0
3+
VERSION 0.1.1
44
DESCRIPTION "Minter Transaction Maker"
55
LANGUAGES CXX
66
)
@@ -87,9 +87,7 @@ endif ()
8787
target_compile_options(ethcore PUBLIC -fPIC)
8888
target_include_directories(ethcore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
8989

90-
target_link_libraries(ethcore PUBLIC
91-
CONAN_PKG::boost_multiprecision
92-
)
90+
target_link_libraries(ethcore PUBLIC CONAN_PKG::boost)
9391

9492
set(HEADERS
9593
include/minter/tx/tx.h
@@ -208,10 +206,6 @@ if (WITH_TEST)
208206

209207
add_executable(${PROJECT_NAME_TEST} ${TEST_SOURCES})
210208
target_compile_options(${PROJECT_NAME_TEST} PUBLIC -Wno-unused-parameter)
211-
212-
# target_include_directories(${PROJECT_NAME_TEST} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
213-
# target_include_directories(${PROJECT_NAME_TEST} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
214-
215209
target_link_libraries(${PROJECT_NAME_TEST} PRIVATE CONAN_PKG::gtest)
216210
target_link_libraries(${PROJECT_NAME_TEST} PUBLIC ${PROJECT_NAME})
217211

conanfile.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ class MinterTxConan(ConanFile):
2323
options = {"shared": [True, False]}
2424
default_options = {
2525
"shared": False,
26-
"boost_system:shared": False,
27-
"boost_filesystem:shared": False,
28-
"boost_thread:shared": False
26+
"boost:shared": False,
2927
}
3028
exports = "version"
3129
exports_sources = (
@@ -47,7 +45,7 @@ class MinterTxConan(ConanFile):
4745
requires = (
4846
'bip39/1.0.0@edwardstock/latest',
4947
'toolboxpp/2.2.0@scatter/latest',
50-
'boost_multiprecision/1.69.0@bincrafters/stable'
48+
'boost/1.70.0@conan/stable'
5149
)
5250

5351
build_requires = (

conanfile.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ cmake
44
[requires]
55
bip39/1.0.0@edwardstock/latest
66
toolboxpp/2.2.0@scatter/latest
7-
boost_multiprecision/1.69.0@bincrafters/stable
7+
boost/1.70.0@conan/stable
88

99
[build_requires]
1010
gtest/1.8.1@bincrafters/stable
1111

1212
[options]
1313
bip39:shared=False
14+
boost:shared=False

src/mintex.h

Lines changed: 0 additions & 19 deletions
This file was deleted.

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.0
1+
0.1.1

0 commit comments

Comments
 (0)