Remove custom s-plugin versioning from root cmake, and remove unneces…

…ary vm field from wasm iface, probably left from 5.0 change i didnt have in 4.0.4 splugin
telosnetwork · Apr 12, 2024 · ebf7a44 · ebf7a44
1 parent 4b51410
commit ebf7a44
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,14 +29,6 @@ endif()
 option(ENABLE_WERROR "Enable `-Werror` compilation flag." Off)
 option(ENABLE_WEXTRA "Enable `-Wextra` compilation flag." Off)
 
-set(SPLUGIN_VERSION_MAJOR 1)
-set(SPLUGIN_VERSION_MINOR 1)
-set(SPLUGIN_VERSION_PATCH 0)
-
-set(
-    VERSION_FULL
-    "${VERSION_FULL}-${SPLUGIN_VERSION_MAJOR}-${SPLUGIN_VERSION_MINOR}-${SPLUGIN_VERSION_PATCH}"
-)
 
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
 set( NODE_EXECUTABLE_NAME nodeos )

diff --git a/libraries/chain/include/eosio/chain/wasm_interface.hpp b/libraries/chain/include/eosio/chain/wasm_interface.hpp
@@ -86,7 +86,6 @@ namespace eosio { namespace chain {
 
       private:
          vm_oc_enable eosvmoc_tierup;
-         vm_type vm;
    };
 
 } } // eosio::chain

diff --git a/programs/nodeos/CMakeLists.txt b/programs/nodeos/CMakeLists.txt
@@ -51,3 +51,4 @@ copy_bin( ${NODE_EXECUTABLE_NAME} )
 install( TARGETS
    ${NODE_EXECUTABLE_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT base
 )
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,3 +51,4 @@ copy_bin( ${NODE_EXECUTABLE_NAME} )
		install( TARGETS
		${NODE_EXECUTABLE_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT base
		)