From 46239f3742bbf263937f63c813472ecdf68d0ed2 Mon Sep 17 00:00:00 2001 From: Dariusz Kedzierski Date: Wed, 7 Nov 2018 13:26:18 +0100 Subject: [PATCH] Fix for issue #2 and #3. Fix for cmake issues with targets --- CMakeLists.txt | 2 +- cd-scripts/deploy.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35c628f255c..a14e40cb07b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,4 +312,4 @@ set(NODEOS_HTTP_SERVER_PORT "http://127.0.0.1:8888") set(SIGNATURE_PROVIDER "${EOSIO_ROOT_KEY}=KEOSD:http://127.0.0.1:8900/v1/wallet/sign_digest") configure_file(${CMAKE_SOURCE_DIR}/cd-scripts/resources/config.ini.in ${CMAKE_BINARY_DIR}/resources/config.ini @ONLY) -configure_file(${CMAKE_SOURCE_DIR}/cd-scripts/resources/genesis.json.in ${CMAKE_BINARY_DIR}/resources/genesis.json) \ No newline at end of file +configure_file(${CMAKE_SOURCE_DIR}/cd-scripts/resources/genesis.json.in ${CMAKE_BINARY_DIR}/resources/genesis.json) diff --git a/cd-scripts/deploy.py b/cd-scripts/deploy.py index e70fc53ee7f..ab8cef5a890 100755 --- a/cd-scripts/deploy.py +++ b/cd-scripts/deploy.py @@ -274,7 +274,7 @@ def build_eosio(c_compiler, cxx_compiler): "-DWASM_ROOT={0}".format(config.WASM_INSTALL_DIR), "-DCORE_SYMBOL_NAME={0}".format(config.CORE_SYMBOL_NAME), "-DOPENSSL_ROOT_DIR={0}".format(config.OPENSSL_ROOT_DIR), - "-DBOOST_ROOT={0}".format(config.BOOST_INSTALL_DIR), + "-DBOOST_ROOT={0}".format(config.BOOST_INSTALL_PREFIX), "-DBUILD_MONGO_DB_PLUGIN={0}".format(config.BUILD_MONGO_DB_PLUGIN), "-DENABLE_COVERAGE_TESTING={0}".format(config.ENABLE_COVERAGE_TESTING), "-DBUILD_DOXYGEN={0}".format(config.DOXYGEN),