Skip to content

build: collapse duplicated SHARED/STATIC add_library branches into VIZ_LIBRARY_TYPE #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chiliec wants to merge 1 commit into from
Closed

build: collapse duplicated SHARED/STATIC add_library branches into VIZ_LIBRARY_TYPE #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(<name> ${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)
Expand Down
9 changes: 1 addition & 8 deletions libraries/api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
59 changes: 1 addition & 58 deletions libraries/chain/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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})
Expand Down
9 changes: 1 addition & 8 deletions libraries/network/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
9 changes: 1 addition & 8 deletions libraries/protocol/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
8 changes: 1 addition & 7 deletions libraries/time/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 1 addition & 7 deletions libraries/utilities/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
9 changes: 1 addition & 8 deletions libraries/wallet/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
9 changes: 1 addition & 8 deletions plugins/account_by_key/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
9 changes: 1 addition & 8 deletions plugins/account_history/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
9 changes: 1 addition & 8 deletions plugins/block_info/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
9 changes: 1 addition & 8 deletions plugins/chain/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
9 changes: 1 addition & 8 deletions plugins/committee_api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
9 changes: 1 addition & 8 deletions plugins/custom_protocol_api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
9 changes: 1 addition & 8 deletions plugins/database_api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
9 changes: 1 addition & 8 deletions plugins/invite_api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
9 changes: 1 addition & 8 deletions plugins/json_rpc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
9 changes: 1 addition & 8 deletions plugins/network_broadcast_api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
Loading