Merge pull request #9543

968d796 cmake: make PER_BLOCK_CHECKPOINT an option (tobtoht)

CMakeLists.txt

@@ -386,14 +386,9 @@ endif()
 set(CMAKE_C_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
-set(PER_BLOCK_CHECKPOINT 1)
-
+option(PER_BLOCK_CHECKPOINT "Enable per-block checkpoint" ON)
 if(PER_BLOCK_CHECKPOINT)
   add_definitions("-DPER_BLOCK_CHECKPOINT")
-  set(Blocks "blocks")
-else()
-  set(Blocks "")
 endif()
 
 list(INSERT CMAKE_MODULE_PATH 0

src/blockchain_utilities/CMakeLists.txt

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

src/daemon/CMakeLists.txt

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

src/device/CMakeLists.txt

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