From d0cb511a40d2bec754986998caff9908432c5580 Mon Sep 17 00:00:00 2001 From: Vladimir Babin Date: Mon, 10 Aug 2026 19:58:52 +0300 Subject: [PATCH] build: collapse duplicated SHARED/STATIC add_library branches into VIZ_LIBRARY_TYPE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Every library and plugin CMakeLists carried the full source + header list twice: once under add_library( SHARED ...) and once under add_library( STATIC ...), inside an if(BUILD_SHARED_LIBRARIES)/else()/endif(). 26 files, with the source list duplicated in each — a standing drift hazard. Introduce a single VIZ_LIBRARY_TYPE variable at root scope (SHARED when BUILD_SHARED_LIBRARIES is ON, STATIC otherwise) and replace each dual-branch block with one add_library( ${VIZ_LIBRARY_TYPE} ...). Net -220 lines. The duplication had already drifted in libraries/chain: the SHARED branch listed invite_evaluator.cpp twice and was missing include/graphene/chain/invite_objects.hpp, while the STATIC branch was correct. Collapsing onto the STATIC list fixes both. Verification: - For all 26 targets the collapsed source/header set is byte-set-identical to the original STATIC branch (which is what the default build, Docker images, and CI all use via -DBUILD_SHARED_LIBRARIES=FALSE), so static-build behavior is unchanged. - Configured a minimal reproduction with real cmake covering both the explicit-source pattern (chain/time) and the ${CURRENT_TARGET_SOURCES} plugin pattern: BUILD_SHARED_LIBRARIES=OFF yields STATIC_LIBRARY targets, ON yields SHARED_LIBRARY targets, matching the previous if/else semantics. graphene:: ALIAS targets still resolve. No source code touched; BUILD_SHARED_LIBRARIES option and its default (FALSE) are unchanged. build-mac.sh (which defaults SHARED_LIBS=ON) keeps a working shared path — now with the chain drift fixed. --- CMakeLists.txt | 10 ++++ libraries/api/CMakeLists.txt | 9 +-- libraries/chain/CMakeLists.txt | 59 +------------------- libraries/network/CMakeLists.txt | 9 +-- libraries/protocol/CMakeLists.txt | 9 +-- libraries/time/CMakeLists.txt | 8 +-- libraries/utilities/CMakeLists.txt | 8 +-- libraries/wallet/CMakeLists.txt | 9 +-- plugins/account_by_key/CMakeLists.txt | 9 +-- plugins/account_history/CMakeLists.txt | 9 +-- plugins/block_info/CMakeLists.txt | 9 +-- plugins/chain/CMakeLists.txt | 9 +-- plugins/committee_api/CMakeLists.txt | 9 +-- plugins/custom_protocol_api/CMakeLists.txt | 9 +-- plugins/database_api/CMakeLists.txt | 9 +-- plugins/invite_api/CMakeLists.txt | 9 +-- plugins/json_rpc/CMakeLists.txt | 9 +-- plugins/network_broadcast_api/CMakeLists.txt | 9 +-- plugins/operation_history/CMakeLists.txt | 9 +-- plugins/p2p/CMakeLists.txt | 9 +-- plugins/paid_subscription_api/CMakeLists.txt | 9 +-- plugins/raw_block/CMakeLists.txt | 9 +-- plugins/snapshot/CMakeLists.txt | 9 +-- plugins/validator/CMakeLists.txt | 9 +-- plugins/validator_api/CMakeLists.txt | 9 +-- plugins/validator_guard/CMakeLists.txt | 9 +-- plugins/webserver/CMakeLists.txt | 9 +-- 27 files changed, 36 insertions(+), 256 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de3e41e15a..8e50e25654 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,6 +53,16 @@ option(Boost_USE_STATIC_LIBS "Build with Boost static libraries usage" TRUE) option(BUILD_SHARED_LIBRARIES "Build shared libraries" FALSE) +# Single source of truth for the library linkage type. Each library/plugin uses +# add_library( ${VIZ_LIBRARY_TYPE} ...) instead of duplicating the full +# source list across if(BUILD_SHARED_LIBRARIES)/else() branches. Set at root +# scope so it propagates into every add_subdirectory below. +if(BUILD_SHARED_LIBRARIES) + set(VIZ_LIBRARY_TYPE SHARED) +else() + set(VIZ_LIBRARY_TYPE STATIC) +endif() + option(BUILD_TESTNET "Build source for test network (ON OR OFF)" FALSE) message(STATUS "BUILD_TESTNET: ${BUILD_TESTNET}") if(BUILD_TESTNET) diff --git a/libraries/api/CMakeLists.txt b/libraries/api/CMakeLists.txt index 5c62ef3c91..1b7b5a56d4 100644 --- a/libraries/api/CMakeLists.txt +++ b/libraries/api/CMakeLists.txt @@ -25,17 +25,10 @@ list(APPEND CURRENT_TARGET_SOURCES paid_subscription_api_object.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) set_property(TARGET graphene_${CURRENT_TARGET} PROPERTY EXPORT_NAME ${CURRENT_TARGET}) diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index b4c8d3aa18..8038bd97ae 100644 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -38,63 +38,7 @@ set(hardfork_hpp_file "${hardfork_hpp_out}") ## SORT .cpp by most likely to change / break compile -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_chain SHARED - - # As database takes the longest to compile, start it first - database.cpp - fork_database.cpp - - chain_evaluator.cpp - invite_evaluator.cpp - - chain_objects.cpp - shared_authority.cpp - # transaction_object.cpp - block_log.cpp - dlt_block_log.cpp - proposal_object.cpp - proposal_evaluator.cpp - database_proposal_object.cpp - chain_properties_evaluators.cpp - committee_evaluator.cpp - invite_evaluator.cpp - paid_subscription_evaluator.cpp - - include/graphene/chain/account_object.hpp - include/graphene/chain/block_log.hpp - include/graphene/chain/dlt_block_log.hpp - include/graphene/chain/block_summary_object.hpp - include/graphene/chain/content_object.hpp - include/graphene/chain/proposal_object.hpp - include/graphene/chain/compound.hpp - include/graphene/chain/custom_operation_interpreter.hpp - include/graphene/chain/database.hpp - include/graphene/chain/database_exceptions.hpp - include/graphene/chain/db_with.hpp - include/graphene/chain/evaluator.hpp - include/graphene/chain/evaluator_registry.hpp - include/graphene/chain/fork_database.hpp - include/graphene/chain/generic_custom_operation_interpreter.hpp - include/graphene/chain/global_property_object.hpp - include/graphene/chain/immutable_chain_parameters.hpp - include/graphene/chain/index.hpp - include/graphene/chain/node_property_object.hpp - include/graphene/chain/operation_notification.hpp - include/graphene/chain/shared_authority.hpp - include/graphene/chain/shared_db_merkle.hpp - include/graphene/chain/chain_evaluator.hpp - include/graphene/chain/chain_object_types.hpp - include/graphene/chain/chain_objects.hpp - include/graphene/chain/transaction_object.hpp - include/graphene/chain/validator_objects.hpp - include/graphene/chain/committee_objects.hpp - include/graphene/chain/paid_subscription_objects.hpp - - ${hardfork_hpp_file} - ) -else() - add_library(graphene_chain STATIC +add_library(graphene_chain ${VIZ_LIBRARY_TYPE} # As database takes the longest to compile, start it first database.cpp @@ -148,7 +92,6 @@ else() ${hardfork_hpp_file} ) -endif() add_dependencies(graphene_chain graphene_protocol graphene_utilities build_hardfork_hpp) target_link_libraries(graphene_chain graphene_protocol graphene_utilities fc chainbase appbase ${PATCH_MERGE_LIB}) diff --git a/libraries/network/CMakeLists.txt b/libraries/network/CMakeLists.txt index 05c9ee4913..338439a994 100644 --- a/libraries/network/CMakeLists.txt +++ b/libraries/network/CMakeLists.txt @@ -14,17 +14,10 @@ list(APPEND ${CURRENT_TARGET}_SOURCES dlt_p2p_node.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${${CURRENT_TARGET}_HEADERS} ${${CURRENT_TARGET}_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${${CURRENT_TARGET}_HEADERS} - ${${CURRENT_TARGET}_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) set_property(TARGET graphene_${CURRENT_TARGET} PROPERTY EXPORT_NAME ${CURRENT_TARGET}) diff --git a/libraries/protocol/CMakeLists.txt b/libraries/protocol/CMakeLists.txt index b35c204b2b..50ddd26582 100644 --- a/libraries/protocol/CMakeLists.txt +++ b/libraries/protocol/CMakeLists.txt @@ -37,17 +37,10 @@ list(APPEND ${CURRENT_TARGET}_SOURCES version.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${${CURRENT_TARGET}_HEADERS} ${${CURRENT_TARGET}_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${${CURRENT_TARGET}_HEADERS} - ${${CURRENT_TARGET}_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) set_property(TARGET graphene_${CURRENT_TARGET} PROPERTY EXPORT_NAME ${CURRENT_TARGET}) diff --git a/libraries/time/CMakeLists.txt b/libraries/time/CMakeLists.txt index 5e34f97814..0bbdde0a62 100644 --- a/libraries/time/CMakeLists.txt +++ b/libraries/time/CMakeLists.txt @@ -1,14 +1,8 @@ file(GLOB HEADERS "include/graphene/time/*.hpp") -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_time SHARED +add_library(graphene_time ${VIZ_LIBRARY_TYPE} time.cpp ) -else() - add_library(graphene_time STATIC - time.cpp - ) -endif() target_link_libraries(graphene_time fc) target_include_directories(graphene_time diff --git a/libraries/utilities/CMakeLists.txt b/libraries/utilities/CMakeLists.txt index 1b9747ce1a..89d0e21531 100644 --- a/libraries/utilities/CMakeLists.txt +++ b/libraries/utilities/CMakeLists.txt @@ -26,15 +26,9 @@ 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") -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_utilities SHARED +add_library(graphene_utilities ${VIZ_LIBRARY_TYPE} ${sources} ${HEADERS}) -else() - add_library(graphene_utilities STATIC - ${sources} - ${HEADERS}) -endif() target_link_libraries(graphene_utilities fc) target_include_directories(graphene_utilities PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") diff --git a/libraries/wallet/CMakeLists.txt b/libraries/wallet/CMakeLists.txt index b1c42f093d..ef01243368 100644 --- a/libraries/wallet/CMakeLists.txt +++ b/libraries/wallet/CMakeLists.txt @@ -19,17 +19,10 @@ list(APPEND ${CURRENT_TARGET}_SOURCES wallet.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${${CURRENT_TARGET}_HEADERS} ${${CURRENT_TARGET}_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${${CURRENT_TARGET}_HEADERS} - ${${CURRENT_TARGET}_SOURCES} - ) -endif() # I don't know why graphene_app is required twice in the following line, I just know the linker breaks if it isn't. target_link_libraries( graphene_${CURRENT_TARGET} diff --git a/plugins/account_by_key/CMakeLists.txt b/plugins/account_by_key/CMakeLists.txt index d4305fcc38..73d38dca96 100644 --- a/plugins/account_by_key/CMakeLists.txt +++ b/plugins/account_by_key/CMakeLists.txt @@ -9,17 +9,10 @@ list(APPEND CURRENT_TARGET_SOURCES account_by_key_plugin.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) set_property(TARGET graphene_${CURRENT_TARGET} PROPERTY EXPORT_NAME ${CURRENT_TARGET}) diff --git a/plugins/account_history/CMakeLists.txt b/plugins/account_history/CMakeLists.txt index 0aa4d45ea0..9165b70a53 100644 --- a/plugins/account_history/CMakeLists.txt +++ b/plugins/account_history/CMakeLists.txt @@ -9,17 +9,10 @@ list(APPEND CURRENT_TARGET_SOURCES plugin.cpp ) -if (BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) diff --git a/plugins/block_info/CMakeLists.txt b/plugins/block_info/CMakeLists.txt index 2e771eedd8..9162cf5c9f 100644 --- a/plugins/block_info/CMakeLists.txt +++ b/plugins/block_info/CMakeLists.txt @@ -9,17 +9,10 @@ list(APPEND CURRENT_TARGET_SOURCES plugin.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) diff --git a/plugins/chain/CMakeLists.txt b/plugins/chain/CMakeLists.txt index 0dc1c2c1d4..94f67fbc0f 100644 --- a/plugins/chain/CMakeLists.txt +++ b/plugins/chain/CMakeLists.txt @@ -7,17 +7,10 @@ list(APPEND CURRENT_TARGET_SOURCES plugin.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) diff --git a/plugins/committee_api/CMakeLists.txt b/plugins/committee_api/CMakeLists.txt index f9e373dd22..dd9bb9db1b 100644 --- a/plugins/committee_api/CMakeLists.txt +++ b/plugins/committee_api/CMakeLists.txt @@ -8,17 +8,10 @@ list(APPEND CURRENT_TARGET_SOURCES committee_api.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) diff --git a/plugins/custom_protocol_api/CMakeLists.txt b/plugins/custom_protocol_api/CMakeLists.txt index e9928c74c2..b387018c95 100644 --- a/plugins/custom_protocol_api/CMakeLists.txt +++ b/plugins/custom_protocol_api/CMakeLists.txt @@ -11,17 +11,10 @@ list(APPEND CURRENT_TARGET_SOURCES custom_protocol_api_visitor.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) diff --git a/plugins/database_api/CMakeLists.txt b/plugins/database_api/CMakeLists.txt index f6f7010d8c..b6c590acfe 100644 --- a/plugins/database_api/CMakeLists.txt +++ b/plugins/database_api/CMakeLists.txt @@ -17,17 +17,10 @@ list(APPEND ${CURRENT_TARGET}_SOURCES proposal_api_object.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${${CURRENT_TARGET}_HEADERS} ${${CURRENT_TARGET}_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${${CURRENT_TARGET}_HEADERS} - ${${CURRENT_TARGET}_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) set_property(TARGET graphene_${CURRENT_TARGET} PROPERTY EXPORT_NAME ${CURRENT_TARGET}) diff --git a/plugins/invite_api/CMakeLists.txt b/plugins/invite_api/CMakeLists.txt index 9aef53fafc..bee8ce42b8 100644 --- a/plugins/invite_api/CMakeLists.txt +++ b/plugins/invite_api/CMakeLists.txt @@ -8,17 +8,10 @@ list(APPEND CURRENT_TARGET_SOURCES invite_api.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) diff --git a/plugins/json_rpc/CMakeLists.txt b/plugins/json_rpc/CMakeLists.txt index 20e76ca7b8..693986027f 100644 --- a/plugins/json_rpc/CMakeLists.txt +++ b/plugins/json_rpc/CMakeLists.txt @@ -9,17 +9,10 @@ list(APPEND CURRENT_TARGET_SOURCES plugin.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) set_property(TARGET graphene_${CURRENT_TARGET} PROPERTY EXPORT_NAME ${CURRENT_TARGET}) diff --git a/plugins/network_broadcast_api/CMakeLists.txt b/plugins/network_broadcast_api/CMakeLists.txt index 6bf71a5e1a..80a362189a 100644 --- a/plugins/network_broadcast_api/CMakeLists.txt +++ b/plugins/network_broadcast_api/CMakeLists.txt @@ -8,17 +8,10 @@ list(APPEND CURRENT_TARGET_SOURCES network_broadcast_api.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) set_property(TARGET graphene_${CURRENT_TARGET} PROPERTY EXPORT_NAME ${CURRENT_TARGET}) diff --git a/plugins/operation_history/CMakeLists.txt b/plugins/operation_history/CMakeLists.txt index 8624cd0b6e..ef75fc5334 100644 --- a/plugins/operation_history/CMakeLists.txt +++ b/plugins/operation_history/CMakeLists.txt @@ -11,17 +11,10 @@ list(APPEND CURRENT_TARGET_SOURCES applied_operation.cpp ) -if (BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) diff --git a/plugins/p2p/CMakeLists.txt b/plugins/p2p/CMakeLists.txt index 9a2016fc83..250ca837ec 100644 --- a/plugins/p2p/CMakeLists.txt +++ b/plugins/p2p/CMakeLists.txt @@ -8,17 +8,10 @@ list(APPEND CURRENT_TARGET_SOURCES p2p_plugin.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) diff --git a/plugins/paid_subscription_api/CMakeLists.txt b/plugins/paid_subscription_api/CMakeLists.txt index 6f77385552..738961ff25 100644 --- a/plugins/paid_subscription_api/CMakeLists.txt +++ b/plugins/paid_subscription_api/CMakeLists.txt @@ -8,17 +8,10 @@ list(APPEND CURRENT_TARGET_SOURCES paid_subscription_api.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) diff --git a/plugins/raw_block/CMakeLists.txt b/plugins/raw_block/CMakeLists.txt index 1874ae46c3..b36371d95c 100644 --- a/plugins/raw_block/CMakeLists.txt +++ b/plugins/raw_block/CMakeLists.txt @@ -8,17 +8,10 @@ list(APPEND CURRENT_TARGET_SOURCES plugin.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) diff --git a/plugins/snapshot/CMakeLists.txt b/plugins/snapshot/CMakeLists.txt index 222eb3a84f..5ba8561a9c 100644 --- a/plugins/snapshot/CMakeLists.txt +++ b/plugins/snapshot/CMakeLists.txt @@ -10,17 +10,10 @@ list(APPEND CURRENT_TARGET_SOURCES plugin.cpp ) -if (BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) diff --git a/plugins/validator/CMakeLists.txt b/plugins/validator/CMakeLists.txt index 17ffa2886b..a4cd4835ad 100644 --- a/plugins/validator/CMakeLists.txt +++ b/plugins/validator/CMakeLists.txt @@ -8,17 +8,10 @@ list(APPEND CURRENT_TARGET_SOURCES validator.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) set_property(TARGET graphene_${CURRENT_TARGET} PROPERTY EXPORT_NAME ${CURRENT_TARGET}) diff --git a/plugins/validator_api/CMakeLists.txt b/plugins/validator_api/CMakeLists.txt index 5bfbc7b448..f0504bc9f5 100644 --- a/plugins/validator_api/CMakeLists.txt +++ b/plugins/validator_api/CMakeLists.txt @@ -9,17 +9,10 @@ list(APPEND CURRENT_TARGET_SOURCES plugin.cpp ) -if (BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) diff --git a/plugins/validator_guard/CMakeLists.txt b/plugins/validator_guard/CMakeLists.txt index c7b5ccf926..cb1da481b6 100644 --- a/plugins/validator_guard/CMakeLists.txt +++ b/plugins/validator_guard/CMakeLists.txt @@ -8,17 +8,10 @@ list(APPEND CURRENT_TARGET_SOURCES validator_guard.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET}) set_property(TARGET graphene_${CURRENT_TARGET} PROPERTY EXPORT_NAME ${CURRENT_TARGET}) diff --git a/plugins/webserver/CMakeLists.txt b/plugins/webserver/CMakeLists.txt index 181adf51e5..47c4d7ce52 100644 --- a/plugins/webserver/CMakeLists.txt +++ b/plugins/webserver/CMakeLists.txt @@ -8,17 +8,10 @@ list(APPEND CURRENT_TARGET_SOURCES webserver_plugin.cpp ) -if(BUILD_SHARED_LIBRARIES) - add_library(graphene_${CURRENT_TARGET} SHARED +add_library(graphene_${CURRENT_TARGET} ${VIZ_LIBRARY_TYPE} ${CURRENT_TARGET_HEADERS} ${CURRENT_TARGET_SOURCES} ) -else() - add_library(graphene_${CURRENT_TARGET} STATIC - ${CURRENT_TARGET_HEADERS} - ${CURRENT_TARGET_SOURCES} - ) -endif() add_library(graphene::${CURRENT_TARGET} ALIAS graphene_${CURRENT_TARGET})