Merge pull request #9543

968d796 cmake: make PER_BLOCK_CHECKPOINT an option (tobtoht)
This commit is contained in:
luigi1111 2024-12-23 10:49:23 -05:00
commit 6633fcb72f
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
4 changed files with 3 additions and 9 deletions

View File

@ -386,14 +386,9 @@ endif()
set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG ${OPT_FLAGS_RELEASE}") set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG ${OPT_FLAGS_RELEASE}")
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${OPT_FLAGS_RELEASE}") set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${OPT_FLAGS_RELEASE}")
# set this to 0 if per-block checkpoint needs to be disabled option(PER_BLOCK_CHECKPOINT "Enable per-block checkpoint" ON)
set(PER_BLOCK_CHECKPOINT 1)
if(PER_BLOCK_CHECKPOINT) if(PER_BLOCK_CHECKPOINT)
add_definitions("-DPER_BLOCK_CHECKPOINT") add_definitions("-DPER_BLOCK_CHECKPOINT")
set(Blocks "blocks")
else()
set(Blocks "")
endif() endif()
list(INSERT CMAKE_MODULE_PATH 0 list(INSERT CMAKE_MODULE_PATH 0

View File

@ -148,7 +148,7 @@ target_link_libraries(blockchain_import
${Boost_THREAD_LIBRARY} ${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES} ${EXTRA_LIBRARIES}
${Blocks}) $<TARGET_NAME_IF_EXISTS:blocks>)
if(ARCH_WIDTH) if(ARCH_WIDTH)
target_compile_definitions(blockchain_import target_compile_definitions(blockchain_import

View File

@ -68,7 +68,7 @@ target_link_libraries(daemon
${ZMQ_LIB} ${ZMQ_LIB}
${GNU_READLINE_LIBRARY} ${GNU_READLINE_LIBRARY}
${EXTRA_LIBRARIES} ${EXTRA_LIBRARIES}
${Blocks}) $<TARGET_NAME_IF_EXISTS:blocks>)
set_property(TARGET daemon set_property(TARGET daemon
PROPERTY PROPERTY
OUTPUT_NAME "monerod") OUTPUT_NAME "monerod")

View File

@ -78,5 +78,4 @@ target_link_libraries(device
${Boost_SERIALIZATION_LIBRARY} ${Boost_SERIALIZATION_LIBRARY}
PRIVATE PRIVATE
version version
${Blocks}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})