From 2da68404059b0834dff3a14009ee5cf6fa0fec1c Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 8 Jan 2016 11:01:25 -0500 Subject: [PATCH] Optionally disable database unity build #509 --- libraries/chain/CMakeLists.txt | 33 ++++++++++++++++--------- libraries/chain/db_getter.cpp | 2 ++ libraries/chain/db_init.cpp | 3 +++ libraries/chain/db_maint.cpp | 2 ++ libraries/chain/db_update.cpp | 3 ++- libraries/chain/db_witness_schedule.cpp | 1 - 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index 199bf104..18f52f16 100644 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -1,23 +1,32 @@ file(GLOB HEADERS "include/graphene/chain/*.hpp") +if( GRAPHENE_DISABLE_UNITY_BUILD ) + set( GRAPHENE_DB_FILES + db_balance.cpp + db_block.cpp + db_debug.cpp + db_getter.cpp + db_init.cpp + db_maint.cpp + db_management.cpp + db_market.cpp + db_update.cpp + db_witness_schedule.cpp + ) + message( STATUS "Graphene database unity build disabled" ) +else( GRAPHENE_DISABLE_UNITY_BUILD ) + set( GRAPHENE_DB_FILES + database.cpp ) + message( STATUS "Graphene database unity build enabled" ) +endif( GRAPHENE_DISABLE_UNITY_BUILD ) + ## SORT .cpp by most likely to change / break compile add_library( graphene_chain # As database takes the longest to compile, start it first - database.cpp + ${GRAPHENE_DB_FILES} fork_database.cpp -# db_balance.cpp -# db_block.cpp -# db_debug.cpp -# db_getter.cpp -# db_init.cpp -# db_maint.cpp -# db_management.cpp -# db_market.cpp -# db_update.cpp -# db_witness_schedule.cpp - protocol/types.cpp protocol/address.cpp protocol/authority.cpp diff --git a/libraries/chain/db_getter.cpp b/libraries/chain/db_getter.cpp index 617f871b..4af2df3e 100644 --- a/libraries/chain/db_getter.cpp +++ b/libraries/chain/db_getter.cpp @@ -28,6 +28,8 @@ #include #include +#include + namespace graphene { namespace chain { const asset_object& database::get_core_asset() const diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 4d2c8b96..ca5d0f18 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -32,6 +32,8 @@ #include #include #include +#include +#include #include #include #include @@ -56,6 +58,7 @@ #include +#include #include #include diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index 176fcf90..bf5453fd 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -31,6 +31,8 @@ #include #include +#include +#include #include #include #include diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index 12e8b37a..72f53393 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -27,11 +27,12 @@ #include #include +#include #include #include -#include #include #include + #include #include diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index 882e90ef..66db87ee 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#pragma once #include #include