EOSIO · heifner · Aug 9, 2018 · May 17, 2018 · May 17, 2018 · May 17, 2018
diff --git a/CMakeModules/FindSoci.cmake b/CMakeModules/FindSoci.cmake
diff --git a/CMakeModules/additionalPlugins.cmake b/CMakeModules/additionalPlugins.cmake
@@ -0,0 +1,13 @@
+macro(eosio_additional_plugin)
+    set(ADDITIONAL_PLUGINS_TARGET "${ADDITIONAL_PLUGINS_TARGET};${ARGN}" PARENT_SCOPE)
+endmacro()
+
+foreach(ADDITIONAL_PLUGIN_SOURCE_DIR ${EOSIO_ADDITIONAL_PLUGINS})
+    string(UUID ADDITIONAL_PLUGIN_SOURCE_DIR_MD5 NAMESPACE "00000000-0000-0000-0000-000000000000" NAME ${ADDITIONAL_PLUGIN_SOURCE_DIR} TYPE MD5)
+    message(STATUS "[Additional Plugin] ${ADDITIONAL_PLUGIN_SOURCE_DIR} => ${CMAKE_BINARY_DIR}/additional_plugins/${ADDITIONAL_PLUGIN_SOURCE_DIR_MD5}")
+    add_subdirectory(${ADDITIONAL_PLUGIN_SOURCE_DIR} ${CMAKE_BINARY_DIR}/additional_plugins/${ADDITIONAL_PLUGIN_SOURCE_DIR_MD5})
+endforeach()
+
+foreach(ADDITIONAL_PLUGIN_TARGET ${ADDITIONAL_PLUGINS_TARGET})
+    target_link_libraries( nodeos PRIVATE -Wl,${whole_archive_flag} ${ADDITIONAL_PLUGIN_TARGET} -Wl,${no_whole_archive_flag} )
+endforeach()
diff --git a/libraries/fc b/libraries/fc
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -17,7 +17,6 @@ add_subdirectory(txn_test_gen_plugin)
 add_subdirectory(db_size_api_plugin)
 #add_subdirectory(faucet_testnet_plugin)
 add_subdirectory(mongo_db_plugin)
-#add_subdirectory(sql_db_plugin)
 add_subdirectory(login_plugin)
 
 # Forward variables to top level so packaging picks them up

diff --git a/plugins/sql_db_plugin/CMakeLists.txt b/plugins/sql_db_plugin/CMakeLists.txt
diff --git a/plugins/sql_db_plugin/block_storage.cpp b/plugins/sql_db_plugin/block_storage.cpp
diff --git a/plugins/sql_db_plugin/block_storage.h b/plugins/sql_db_plugin/block_storage.h
diff --git a/plugins/sql_db_plugin/consumer.h b/plugins/sql_db_plugin/consumer.h
diff --git a/plugins/sql_db_plugin/consumer_core.h b/plugins/sql_db_plugin/consumer_core.h
diff --git a/plugins/sql_db_plugin/db/accounts_table.cpp b/plugins/sql_db_plugin/db/accounts_table.cpp
diff --git a/plugins/sql_db_plugin/db/accounts_table.h b/plugins/sql_db_plugin/db/accounts_table.h
diff --git a/plugins/sql_db_plugin/db/actions_table.cpp b/plugins/sql_db_plugin/db/actions_table.cpp
diff --git a/plugins/sql_db_plugin/db/actions_table.h b/plugins/sql_db_plugin/db/actions_table.h
diff --git a/plugins/sql_db_plugin/db/blocks_table.cpp b/plugins/sql_db_plugin/db/blocks_table.cpp