From 4490c3fa48dbbc41c1d5231f1ef7c64a9e07db9b Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Mon, 15 Jun 2015 14:43:51 -0400 Subject: [PATCH] Win32 compile fixes --- libraries/chain/CMakeLists.txt | 2 +- libraries/fc | 2 +- tests/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index a6fd1d07..4d4c3abe 100644 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -55,5 +55,5 @@ target_include_directories( graphene_chain PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" ) if(MSVC) - set_source_files_properties( db_init.cpp PROPERTIES COMPILE_FLAGS "/bigobj" ) + set_source_files_properties( db_init.cpp db_block.cpp PROPERTIES COMPILE_FLAGS "/bigobj" ) endif(MSVC) diff --git a/libraries/fc b/libraries/fc index f7cf9abe..10e74740 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit f7cf9abe558a05c38091d0fce689aa2a91a993b5 +Subproject commit 10e747409c5d656e794cb2e10cc51d5e31978cf1 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 86aad075..468425e4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,11 +2,11 @@ file(GLOB COMMON_SOURCES "common/*.cpp") file(GLOB UNIT_TESTS "tests/*.cpp") add_executable( chain_test ${UNIT_TESTS} ${COMMON_SOURCES} ) -target_link_libraries( chain_test graphene_chain graphene_app graphene_account_history fc z) +target_link_libraries( chain_test graphene_chain graphene_app graphene_account_history fc ) file(GLOB PERFORMANCE_TESTS "performance/*.cpp") add_executable( performance_test ${PERFORMANCE_TESTS} ${COMMON_SOURCES} ) -target_link_libraries( performance_test graphene_chain graphene_app graphene_account_history fc z) +target_link_libraries( performance_test graphene_chain graphene_app graphene_account_history fc ) file(GLOB BENCH_MARKS "benchmarks/*.cpp") add_executable( chain_bench ${BENCH_MARKS} ${COMMON_SOURCES} )