Split libraries (#1000)

* make two libs POP_LIB and BFI_LIB

* update

Author: Mr-Leshiy

CMakeLists.txt

@@ -69,7 +69,9 @@ option(WITH_TRACER   "Build with `tracy` tracer enabled" OFF)
 option(WITH_BACKWARD "If ON, any failure will print stacktrace (only in Debug mode)" ON)
 
 
-set(LIB_NAME veriblock-pop-cpp)
+set(LIB_NAME veriblock)
+set(POP_LIB_NAME "${LIB_NAME}-pop-cpp")
+set(BFI_LIB_NAME "${LIB_NAME}-bfi-cpp")
 project(${LIB_NAME} LANGUAGES C CXX)
 
 include(FetchContent)
@@ -213,6 +215,13 @@ if(WITH_PYPOPTOOLS)
     add_subdirectory(pypoptools)
 endif()
 
+if(SHARED)
+    set(BUILD SHARED)
+else()
+    set(BUILD STATIC)
+endif()
+message(STATUS "BUILD=${BUILD}")
+
 message(STATUS "ALT_HASH_SIZE=${ALT_HASH_SIZE}")
 message(STATUS "CLANG_TIDY=${CLANG_TIDY}")
 message(STATUS "ASAN=${ASAN}")

benchmark/CMakeLists.txt

@@ -9,7 +9,7 @@ function(addbenchmark name)
     target_link_libraries(${_target}
             benchmark::benchmark
             Threads::Threads
-            ${LIB_NAME}
+            ${POP_LIB_NAME}
             )
 endfunction()
 

cmake/lib.pc.in

@@ -1,9 +1,9 @@
 libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
 includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@
 
-Name: @LIB_NAME@
+Name: @POP_LIB_NAME@
 Description: Libraries for leveraging VeriBlock Proof-Of-Proof blockchain technology.
 Version: @PROJECT_VERSION@
 URL: https://github.com/VeriBlock/alt-integration-cpp
-Libs: -L${libdir} -l@LIB_NAME@ @VBK_DEPENDENCIES_LIBS@ -lstdc++ -lm @SANITIZERS_LIBS@
+Libs: -L${libdir} -l@POP_LIB_NAME@ @VBK_DEPENDENCIES_LIBS@ -lstdc++ -lm @SANITIZERS_LIBS@
 Cflags: -I${includedir} @SANITIZERS_CFLAGS@ @ADDITIONAL_CFLAGS@

fuzz/fuzz.cmake

@@ -22,7 +22,7 @@ function(fuzz_add_cov_flags target)
 endfunction()
 
 
-fuzz_add_cov_flags(${LIB_NAME})
+fuzz_add_cov_flags(${POP_LIB_NAME})
 
 
 add_custom_target(fuzz
@@ -31,7 +31,7 @@ add_custom_target(fuzz
         )
 add_custom_command(
         OUTPUT fuzz_targets
-        DEPENDS ${LIB_NAME}
+        DEPENDS ${POP_LIB_NAME}
         COMMAND ;
 )
 set_source_files_properties(fuzz_targets PROPERTIES SYMBOLIC "true")
@@ -81,7 +81,7 @@ function(add_fuzz FUZZ_TARGET)
             CXX_STANDARD 17
             CXX_STANDARD_REQUIRED TRUE
             )
-    target_link_libraries(${FUZZ_TARGET} PUBLIC ${LIB_NAME})
+    target_link_libraries(${FUZZ_TARGET} PUBLIC ${POP_LIB_NAME})
     target_compile_options(${FUZZ_TARGET} PUBLIC
             -fsanitize=${fuzzers}
             -g

pypoptools/CMakeLists.txt

@@ -21,6 +21,6 @@ add_subdirectory(pypoptesting)
 add_custom_target(install_pypoptools
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/setup.py install --user
-        DEPENDS ${LIB_NAME}
+        DEPENDS ${POP_LIB_NAME}
         COMMENT "Installing pypoptools..."
         )

pypoptools/pypopminer/CMakeLists.txt

@@ -24,7 +24,7 @@ add_library(pypopminer MODULE
 target_link_libraries(pypopminer
         ${Boost_LIBRARIES}
         ${PYTHON_LIBRARIES}
-        ${LIB_NAME}
+        ${POP_LIB_NAME}
         )
 
 set_target_properties(pypopminer PROPERTIES

src/bfi/CMakeLists.txt

@@ -1 +1,60 @@
 add_subdirectory(veriblock)
+
+set(SOURCES 
+        dummy.cpp
+        )
+
+add_library(${BFI_LIB_NAME} ${BUILD} ${SOURCES})
+enable_clang_tidy(${BFI_LIB_NAME})
+
+target_link_libraries(${BFI_LIB_NAME} ${POP_LIB_NAME})
+
+set_target_properties(${BFI_LIB_NAME} PROPERTIES
+        VERSION ${VERSION}
+        SOVERSION ${MAJOR_VERSION}
+        INTERFACE_${BFI_LIB_NAME}_MAJOR_VERSION ${MAJOR_VERSION}
+        )
+set_property(
+        TARGET ${BFI_LIB_NAME}
+        APPEND PROPERTY
+        COMPATIBLE_INTERFACE_STRING MAJOR_VERSION
+)
+
+# make install is not defined with FUZZING=ON
+if(NOT FUZZING)
+    install(TARGETS ${BFI_LIB_NAME}
+            EXPORT ${BFI_LIB_NAME}Config
+            COMPONENT devel
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+            INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+            PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+            FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX}
+            )
+    install(
+            DIRECTORY ${CMAKE_SOURCE_DIR}/include/veriblock
+            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    )
+    install(
+            EXPORT ${BFI_LIB_NAME}Config
+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${BFI_LIB_NAME}
+    )
+    export(
+            TARGETS ${BFI_LIB_NAME}
+            FILE ${BFI_LIB_NAME}Config.cmake
+    )
+endif()
+
+target_include_directories(${BFI_LIB_NAME}
+        INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+        )
+
+
+enable_asan_on_target(${BFI_LIB_NAME})
+enable_tsan_on_target(${BFI_LIB_NAME})
+enable_ubsan_on_target(${BFI_LIB_NAME})
+enable_werror(${BFI_LIB_NAME})
+enable_stacktrace_on_target(${BFI_LIB_NAME})

src/bfi/dummy.cpp

@@ -0,0 +1 @@
+#include <veriblock/pop/entities/coin.hpp>

src/pop/CMakeLists.txt

@@ -87,20 +87,13 @@ if(VERIBLOCK_POP_LOGGER_ENABLED)
     list(APPEND SOURCES logger.cpp)
 endif()
 
-if(SHARED)
-    set(BUILD SHARED)
-else()
-    set(BUILD STATIC)
-endif()
-message(STATUS "BUILD=${BUILD}")
-
-add_library(${LIB_NAME} ${BUILD} ${SOURCES})
-enable_clang_tidy(${LIB_NAME})
+add_library(${POP_LIB_NAME} ${BUILD} ${SOURCES})
+enable_clang_tidy(${POP_LIB_NAME})
 
 if(WITH_TRACER)
     add_compile_definitions(TRACY_ON_DEMAND)
-    target_sources(${LIB_NAME} PRIVATE $<TARGET_OBJECTS:tracy>)
-    target_link_libraries(${LIB_NAME} PUBLIC dl)
+    target_sources(${POP_LIB_NAME} PRIVATE $<TARGET_OBJECTS:tracy>)
+    target_link_libraries(${POP_LIB_NAME} PUBLIC dl)
     set(ADDITIONAL_CFLAGS -DTRACY_ENABLE=1)
     if(UNIX)
         set(VBK_DEPENDENCIES_LIBS ${VBK_DEPENDENCIES_LIBS} -ldl)
@@ -109,21 +102,21 @@ if(WITH_TRACER)
     endif()
 endif()
 
-set_target_properties(${LIB_NAME} PROPERTIES
+set_target_properties(${POP_LIB_NAME} PROPERTIES
         VERSION ${VERSION}
         SOVERSION ${MAJOR_VERSION}
-        INTERFACE_${LIB_NAME}_MAJOR_VERSION ${MAJOR_VERSION}
+        INTERFACE_${POP_LIB_NAME}_MAJOR_VERSION ${MAJOR_VERSION}
         )
 set_property(
-        TARGET ${LIB_NAME}
+        TARGET ${POP_LIB_NAME}
         APPEND PROPERTY
         COMPATIBLE_INTERFACE_STRING MAJOR_VERSION
 )
 
 # make install is not defined with FUZZING=ON
 if(NOT FUZZING)
-    install(TARGETS ${LIB_NAME}
-            EXPORT ${LIB_NAME}Config
+    install(TARGETS ${POP_LIB_NAME}
+            EXPORT ${POP_LIB_NAME}Config
             COMPONENT devel
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -137,15 +130,15 @@ if(NOT FUZZING)
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     )
     install(
-            EXPORT ${LIB_NAME}Config
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LIB_NAME}
+            EXPORT ${POP_LIB_NAME}Config
+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${POP_LIB_NAME}
     )
     export(
-            TARGETS ${LIB_NAME}
-            FILE ${LIB_NAME}Config.cmake
+            TARGETS ${POP_LIB_NAME}
+            FILE ${POP_LIB_NAME}Config.cmake
     )
 endif()
-target_include_directories(${LIB_NAME}
+target_include_directories(${POP_LIB_NAME}
         INTERFACE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:include>
@@ -166,14 +159,14 @@ endif()
 
 string(REPLACE ";" " " VBK_DEPENDENCIES_LIBS "${VBK_DEPENDENCIES_LIBS}")
 
-set(configured_pc ${CMAKE_BINARY_DIR}/${LIB_NAME}.pc)
+set(configured_pc ${CMAKE_BINARY_DIR}/${POP_LIB_NAME}.pc)
 configure_file("${CMAKE_SOURCE_DIR}/cmake/lib.pc.in" "${configured_pc}" @ONLY)
 install(FILES "${configured_pc}"
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 
 
-enable_asan_on_target(${LIB_NAME})
-enable_tsan_on_target(${LIB_NAME})
-enable_ubsan_on_target(${LIB_NAME})
-enable_werror(${LIB_NAME})
-enable_stacktrace_on_target(${LIB_NAME})
+enable_asan_on_target(${POP_LIB_NAME})
+enable_tsan_on_target(${POP_LIB_NAME})
+enable_ubsan_on_target(${POP_LIB_NAME})
+enable_werror(${POP_LIB_NAME})
+enable_stacktrace_on_target(${POP_LIB_NAME})

test/CMakeLists.txt

@@ -1,4 +1,4 @@
-link_libraries(${LIB_NAME})
+link_libraries(${POP_LIB_NAME})
 include_directories(${CMAKE_CURRENT_LIST_DIR})
 include_directories(${CMAKE_BINARY_DIR}/include)
 

tools/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_executable(filetoheader EXCLUDE_FROM_ALL filetoheader.cpp)
 add_executable(build_payouts_table EXCLUDE_FROM_ALL build_payouts_table.cpp)
-target_link_libraries(build_payouts_table ${LIB_NAME})
+target_link_libraries(build_payouts_table ${POP_LIB_NAME})
 
 add_executable(build_seedhash_epochs build_seedhash_epochs.cpp)
-target_link_libraries(build_seedhash_epochs ${LIB_NAME})
+target_link_libraries(build_seedhash_epochs ${POP_LIB_NAME})