Merge pull request #924 from cyberway/develop

Merge last changes from develop

CMakeLists.txt

@@ -4,25 +4,25 @@ if (NOT DEFINED PROJECT_NAME)
     project(golos_dapp_contracts VERSION 0.1.0)
 endif(NOT DEFINED PROJECT_NAME)
 
-set(EOSIO_CDT_VERSION_MIN "1.6")
-set(EOSIO_CDT_VERSION_SOFT_MAX "1.7")
-#set(EOSIO_CDT_VERSION_HARD_MAX "")
+set(CYBERWAY_CDT_VERSION_MIN "1.6")
+set(CYBERWAY_CDT_VERSION_SOFT_MAX "1.7")
+#set(CYBERWAY_CDT_VERSION_HARD_MAX "")
 
-find_package(eosio.cdt)
+find_package(cyberway.cdt)
 
-### Check the version of eosio.cdt
+### Check the version of cyberway.cdt
 set(VERSION_MATCH_ERROR_MSG "")
-EOSIO_CHECK_VERSION(VERSION_OUTPUT "${EOSIO_CDT_VERSION}"
-                                   "${EOSIO_CDT_VERSION_MIN}"
-                                   "${EOSIO_CDT_VERSION_SOFT_MAX}"
-                                   "${EOSIO_CDT_VERSION_HARD_MAX}"
+EOSIO_CHECK_VERSION(VERSION_OUTPUT "${CYBERWAY_CDT_VERSION}"
+                                   "${CYBERWAY_CDT_VERSION_MIN}"
+                                   "${CYBERWAY_CDT_VERSION_SOFT_MAX}"
+                                   "${CYBERWAY_CDT_VERSION_HARD_MAX}"
                                    VERSION_MATCH_ERROR_MSG)
 if(VERSION_OUTPUT STREQUAL "MATCH")
-   message(STATUS "Using eosio.cdt version ${EOSIO_CDT_VERSION}")
+   message(STATUS "Using cyberway.cdt version ${CYBERWAY_CDT_VERSION}")
 elseif(VERSION_OUTPUT STREQUAL "WARN")
-   message(WARNING "Using eosio.cdt version ${EOSIO_CDT_VERSION} even though it exceeds the maximum supported version of ${EOSIO_CDT_VERSION_SOFT_MAX}; continuing with configuration, however build may fail.\nIt is recommended to use eosio.cdt version ${EOSIO_CDT_VERSION_SOFT_MAX}.x")
+   message(WARNING "Using cyberway.cdt version ${CYBERWAY_CDT_VERSION} even though it exceeds the maximum supported version of ${CYBERWAY_CDT_VERSION_SOFT_MAX}; continuing with configuration, however build may fail.\nIt is recommended to use cyberway.cdt version ${CYBERWAY_CDT_VERSION_SOFT_MAX}.x")
 else() # INVALID OR MISMATCH
-   message(FATAL_ERROR "Found eosio.cdt version ${EOSIO_CDT_VERSION} but it does not satisfy version requirements: ${VERSION_MATCH_ERROR_MSG}\nPlease use eosio.cdt version ${EOSIO_CDT_VERSION_SOFT_MAX}.x")
+   message(FATAL_ERROR "Found cyberway.cdt version ${CYBERWAY_CDT_VERSION} but it does not satisfy version requirements: ${VERSION_MATCH_ERROR_MSG}\nPlease use cyberway.cdt version ${CYBERWAY_CDT_VERSION_SOFT_MAX}.x")
 endif(VERSION_OUTPUT STREQUAL "MATCH")
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")

Docker/Dockerfile

@@ -18,7 +18,7 @@ RUN cd golos.contracts/cyberway.contracts \
         -GNinja \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/opt/cyberway.contracts/ \
-        -Deosio.cdt_DIR=/opt/cyberway.cdt/lib/cmake/eosio.cdt \
+        -Dcyberway.cdt_DIR=/opt/cyberway.cdt/lib/cmake/cyberway.cdt \
         -DEOSIO_ROOT=/opt/cyberway \
     && cmake --build build --target install \
     && cd .. \
@@ -27,7 +27,7 @@ RUN cd golos.contracts/cyberway.contracts \
         -GNinja \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/opt/golos.contracts/ \
-        -Deosio.cdt_DIR=/opt/cyberway.cdt/lib/cmake/eosio.cdt \
+        -Dcyberway.cdt_DIR=/opt/cyberway.cdt/lib/cmake/cyberway.cdt \
         -DEOSIO_ROOT=/opt/cyberway \
     && cmake --build build --target install