File tree Expand file tree Collapse file tree 6 files changed +8
-34
lines changed
Expand file tree Collapse file tree 6 files changed +8
-34
lines changed Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change 11cmake_minimum_required (VERSION 3.10)
22project (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 ()
8787target_compile_options (ethcore PUBLIC -fPIC)
8888target_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
9492set (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
Original file line number Diff line number Diff 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 = (
Original file line number Diff line number Diff line change 44[requires]
55bip39/1.0.0@edwardstock/latest
66toolboxpp/2.2.0@scatter/latest
7- boost_multiprecision /1.69 .0@bincrafters /stable
7+ boost /1.70 .0@conan /stable
88
99[build_requires]
1010gtest/1.8.1@bincrafters/stable
1111
1212[options]
1313bip39:shared=False
14+ boost:shared=False
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1- 0.1.0
1+ 0.1.1
You can’t perform that action at this time.
0 commit comments