Merge pull request EOSIO#120 from enumivo/staging

rename eos_utilities
bithacks-tech · May 17, 2018 · 7f32807 · 7f32807
2 parents 55a3d9f + 2399529
commit 7f32807
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/libraries/abi_generator/CMakeLists.txt b/libraries/abi_generator/CMakeLists.txt
@@ -60,5 +60,5 @@ target_link_libraries(abi_generator
 
 if (USE_PCH)
   set_target_properties(abi_generator PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
-  cotire(eos_utilities)
+  cotire(enu_utilities)
 endif(USE_PCH)
diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
@@ -41,7 +41,7 @@ add_library( enumivo_chain
              ${HEADERS}
              )
 
-target_link_libraries( enumivo_chain eos_utilities fc chainbase Logging IR WAST WASM Runtime
+target_link_libraries( enumivo_chain enu_utilities fc chainbase Logging IR WAST WASM Runtime
       wasm asmjs passes cfg ast emscripten-optimizer support softfloat builtins
                      )
 target_include_directories( enumivo_chain

diff --git a/libraries/testing/CMakeLists.txt b/libraries/testing/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library( enumivo_testing
              ${HEADERS}
         )
 
-target_link_libraries( enumivo_testing enumivo_chain eos_utilities fc chainbase Logging IR WAST WASM Runtime )
+target_link_libraries( enumivo_testing enumivo_chain enu_utilities fc chainbase Logging IR WAST WASM Runtime )
 target_include_directories( enumivo_testing
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include"
                                    "${CMAKE_CURRENT_SOURCE_DIR}/../wasm-jit/Include"

diff --git a/libraries/utilities/CMakeLists.txt b/libraries/utilities/CMakeLists.txt
@@ -7,7 +7,7 @@ if(NOT ENU_GIT_REVISION_DESCRIPTION)
     set(ENU_GIT_REVISION_DESCRIPTION "unknown")
 endif(NOT ENU_GIT_REVISION_DESCRIPTION)
 
-file(GLOB HEADERS "include/eosio/utilities/*.hpp")
+file(GLOB HEADERS "include/enumivo/utilities/*.hpp")
 
 set(sources
    key_conversion.cpp
@@ -19,14 +19,14 @@ set(sources
 #configure_file("${CMAKE_CURRENT_SOURCE_DIR}/git_revision.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/git_revision.cpp" @ONLY)
 #list(APPEND sources "${CMAKE_CURRENT_BINARY_DIR}/git_revision.cpp")
 
-add_library( eos_utilities
+add_library( enu_utilities
              ${sources}
              ${HEADERS} )
-target_link_libraries( eos_utilities fc WAST WASM )
-target_include_directories( eos_utilities
+target_link_libraries( enu_utilities fc WAST WASM )
+target_include_directories( enu_utilities
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
                                    "${CMAKE_CURRENT_SOURCE_DIR}/../wasm-jit/Include" )
 if (USE_PCH)
-  set_target_properties(eos_utilities PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
-  cotire(eos_utilities)
+  set_target_properties(enu_utilities PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
+  cotire(enu_utilities)
 endif(USE_PCH)
diff --git a/plugins/producer_plugin/CMakeLists.txt b/plugins/producer_plugin/CMakeLists.txt
@@ -5,6 +5,6 @@ add_library( producer_plugin
              ${HEADERS}
            )
 
-target_link_libraries( producer_plugin chain_plugin appbase enumivo_chain eos_utilities )
+target_link_libraries( producer_plugin chain_plugin appbase enumivo_chain enu_utilities )
 target_include_directories( producer_plugin
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../chain_interface/include" )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories("${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include")
 file(GLOB UNIT_TESTS "wallet_tests.cpp")
 
 add_executable( plugin_test ${UNIT_TESTS} ${WASM_UNIT_TESTS} main.cpp)
-target_link_libraries( plugin_test enumivo_testing enumivo_chain chainbase eos_utilities chain_plugin wallet_plugin abi_generator fc ${PLATFORM_SPECIFIC_LIBS} )
+target_link_libraries( plugin_test enumivo_testing enumivo_chain chainbase enu_utilities chain_plugin wallet_plugin abi_generator fc ${PLATFORM_SPECIFIC_LIBS} )
 
 target_include_directories( plugin_test PUBLIC ${CMAKE_SOURCE_DIR}/plugins/net_plugin/include )
 add_dependencies(plugin_test asserter test_api test_api_mem test_api_db test_api_multi_index exchange proxy identity identity_test stltest infinite enumivo.system enumivo.coin enumivo.bios test.inline multi_index_test noop dice enumivo.msig)

diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
@@ -22,7 +22,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.hpp.in ${CMAKE_CURRENT
 file(GLOB UNIT_TESTS "*.cpp")
 
 add_executable( unit_test ${UNIT_TESTS} ${WASM_UNIT_TESTS} )
-target_link_libraries( unit_test enumivo_chain chainbase enumivo_testing eos_utilities abi_generator fc ${PLATFORM_SPECIFIC_LIBS} )
+target_link_libraries( unit_test enumivo_chain chainbase enumivo_testing enu_utilities abi_generator fc ${PLATFORM_SPECIFIC_LIBS} )
 
 target_include_directories( unit_test PUBLIC ${CMAKE_BINARY_DIR}/contracts ${CMAKE_CURRENT_BINARY_DIR}/tests/contracts )
 target_include_directories( unit_test PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/wasm_tests )