Fix for issue #2 and #3. Fix for cmake issues with targets

terradacs · Nov 8, 2018 · 46239f3 · 46239f3
1 parent 7fd717e
commit 46239f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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)
+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
@@ -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),