WIRE-241 Refactored all plugins to use standard plugin_target macro

Author: jglanz

cmake/build-init.cmake

@@ -1 +1,17 @@
-file(TOUCH ${CMAKE_BINARY_DIR}/.wire-build-root)
+file(TOUCH ${CMAKE_BINARY_DIR}/.wire-build-root)
+
+if (UNIX)
+    if (APPLE)
+        set(whole_archive_flag "-force_load")
+        set(no_whole_archive_flag "")
+        set(build_id_flag "")
+    else ()
+        set(whole_archive_flag "--whole-archive")
+        set(no_whole_archive_flag "--no-whole-archive")
+        set(build_id_flag "--build-id")
+    endif ()
+else ()
+    set(whole_archive_flag "--whole-archive")
+    set(no_whole_archive_flag "--no-whole-archive")
+    set(build_id_flag "")
+endif ()

cmake/chain-tools.cmake

@@ -7,22 +7,6 @@ macro(chain_target TARGET)
 
     target_include_directories(${TARGET} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 
-    if (UNIX)
-        if (APPLE)
-            set(whole_archive_flag "-force_load")
-            set(no_whole_archive_flag "")
-            set(build_id_flag "")
-        else ()
-            set(whole_archive_flag "--whole-archive")
-            set(no_whole_archive_flag "--no-whole-archive")
-            set(build_id_flag "--build-id")
-        endif ()
-    else ()
-        set(whole_archive_flag "--whole-archive")
-        set(no_whole_archive_flag "--no-whole-archive")
-        set(build_id_flag "")
-    endif ()
-
     target_link_libraries(${TARGET}
             PRIVATE
             -Wl,${whole_archive_flag}
@@ -41,11 +25,8 @@ macro(chain_target TARGET)
             trace_api_plugin
             chain_plugin
             appbase
-            boringssl::crypto
-            boringssl::decrepit
-            boringssl::ssl
-            ${PLUGIN_DEFAULT_DEPENDENCIES}
             -Wl,${no_whole_archive_flag}
+            ${PLUGIN_DEFAULT_DEPENDENCIES}
 
             http_client_plugin
             http_plugin

cmake/plugin-tools.cmake

@@ -3,11 +3,12 @@ if (PLUGIN_DEFAULT_DEPENDENCIES)
 endif ()
 
 set(PLUGIN_DEFAULT_DEPENDENCIES
-        fc
         fc-lite
+        fc
 
         Boost::asio
         Boost::beast
+        Boost::bimap
         Boost::chrono
         Boost::date_time
         Boost::dll
@@ -21,16 +22,19 @@ set(PLUGIN_DEFAULT_DEPENDENCIES
         boringssl::ssl
         boringssl::crypto
         boringssl::decrepit
-        PARENT_SCOPE
+
+        libsodium::libsodium
+
 )
 
 macro(plugin_target TARGET_NAME)
 
-    cmake_parse_arguments(ARG "" "" "LIBRARIES;SOURCE_FILES;SOURCE_GLOBS;TEST_SOURCE_FILES;TEST_SOURCE_GLOBS" ${ARGN})
+    cmake_parse_arguments(ARG "SKIP_TEST_CONFIG" "" "LIBRARIES;SOURCE_FILES;SOURCE_GLOBS;TEST_SOURCE_FILES;TEST_SOURCE_GLOBS" ${ARGN})
 
-    message(STATUS "Building plugin ${TARGET_NAME}: src=${CMAKE_CURRENT_SOURCE_DIR}/src")
+    set(PLUGIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
+    message(STATUS "Building plugin ${TARGET_NAME} @ ${CMAKE_CURRENT_SOURCE_DIR}")
     set(SRC_FILES "")
-    if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src)
+    if (IS_DIRECTORY ${PLUGIN_SRC_DIR})
         file(GLOB_RECURSE SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
     endif ()
     if (ARG_SOURCE_FILES)
@@ -42,7 +46,6 @@ macro(plugin_target TARGET_NAME)
             list(APPEND SRC_FILES ${GLOB_FILES})
         endforeach ()
     endif ()
-    set(TEST_TARGET_NAME test_${TARGET_NAME})
 
     add_library(${TARGET_NAME} STATIC ${SRC_FILES})
 
@@ -56,8 +59,10 @@ macro(plugin_target TARGET_NAME)
     target_link_libraries(
             ${TARGET_NAME}
             PUBLIC
-            fc
-            fc-lite
+            -Wl,${whole_archive_flag}
+            ${PLUGIN_DEFAULT_DEPENDENCIES}
+            -Wl,${no_whole_archive_flag}
+
             ${ARG_LIBRARIES}
     )
 
@@ -71,34 +76,43 @@ macro(plugin_target TARGET_NAME)
 
     )
 
-    if (ENABLE_TESTS)
-        set(TEST_FILES "")
-        if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
-            file(GLOB_RECURSE TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/test/*.cpp)
-        endif ()
-        if (ARG_TEST_SOURCE_FILES)
-            list(APPEND TEST_FILES ${ARG_TEST_SOURCE_FILES})
-        endif ()
-        if (ARG_TEST_SOURCE_GLOBS)
-            foreach (GLOB_PATTERN ${ARG_TEST_SOURCE_GLOBS})
-                file(GLOB_RECURSE GLOB_FILES ${GLOB_PATTERN})
-                list(APPEND TEST_FILES ${GLOB_FILES})
-            endforeach ()
-        endif ()
+    set(PLUGIN_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test)
+    if(NOT ARG_SKIP_TEST_CONFIG AND ENABLE_TESTS AND IS_DIRECTORY ${PLUGIN_TEST_DIR})
+
+        if (EXISTS ${PLUGIN_TEST_DIR}/CMakeLists.txt)
+            message(NOTICE "Plugin ${TARGET_NAME} test directory (${PLUGIN_TEST_DIR}) has a cmake file, so we will use it")
+            add_subdirectory(test)
+        else()
+            set(TEST_TARGET_NAME test_${TARGET_NAME})
 
-        add_executable(${TEST_TARGET_NAME} ${TEST_FILES})
-
-        target_link_libraries(
-                ${TEST_TARGET_NAME}
-                PUBLIC
-                ${TARGET_NAME}
-                sysio_testing
-                sysio_chain_wrap
-        )
-        add_test(
-                NAME ${TEST_TARGET_NAME}
-                COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test/${TEST_TARGET_NAME}
-                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        )
+            set(TEST_FILES "")
+            if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+                file(GLOB_RECURSE TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/test/*.cpp)
+            endif ()
+            if (ARG_TEST_SOURCE_FILES)
+                list(APPEND TEST_FILES ${ARG_TEST_SOURCE_FILES})
+            endif ()
+            if (ARG_TEST_SOURCE_GLOBS)
+                foreach (GLOB_PATTERN ${ARG_TEST_SOURCE_GLOBS})
+                    file(GLOB_RECURSE GLOB_FILES ${GLOB_PATTERN})
+                    list(APPEND TEST_FILES ${GLOB_FILES})
+                endforeach ()
+            endif ()
+
+            add_executable(${TEST_TARGET_NAME} ${TEST_FILES})
+
+            target_link_libraries(
+                    ${TEST_TARGET_NAME}
+                    PUBLIC
+                    ${TARGET_NAME}
+                    sysio_testing
+                    sysio_chain_wrap
+            )
+            add_test(
+                    NAME ${TEST_TARGET_NAME}
+                    COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test/${TEST_TARGET_NAME}
+                    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+            )
+        endif ()
     endif ()
 endmacro()

cmake/test-tools.cmake

@@ -7,11 +7,17 @@ macro(unittest_target TARGET)
 
   target_link_libraries(
     ${TARGET}
+    PUBLIC
+          -Wl,${whole_archive_flag}
+
+          ${PLUGIN_DEFAULT_DEPENDENCIES}
+          -Wl,${no_whole_archive_flag}
+#    ${PLUGIN_DEFAULT_DEPENDENCIES}
+
     sysio_chain_wrap
     state_history
     chainbase
     sysio_testing
-    fc
     custom_appbase
     libsodium::libsodium
   )

plugins/batch_operator_plugin/CMakeLists.txt

@@ -1,53 +1,8 @@
-cmake_minimum_required(VERSION 3.16)
-
-file(GLOB_RECURSE SRC_FILES src/*.cpp)
-add_library(batch_operator_plugin STATIC ${SRC_FILES})
-
-target_include_directories(
-  batch_operator_plugin
-  PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-  $<INSTALL_INTERFACE:include>
-)
-
-target_link_libraries(
-  batch_operator_plugin
-  PUBLIC
-  appbase
-  chainbase
-  chain_plugin
-  fc
-  operator_plugin
-  sysio_chain
-)
-
-# Install headers
-install(
-  TARGETS batch_operator_plugin
-  # TODO: When cleaning up the installation targets, include this library
-  #  allowing other projects to link against it via CMake's find_package
-  #  EXPORT sysioTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include
-
-)
-
-if(ENABLE_TESTS)
-  file(GLOB_RECURSE TEST_FILES test/*.cpp)
-  add_executable(test_batch_operator_plugin ${TEST_FILES})
-
-  target_link_libraries(
-    test_batch_operator_plugin
-    PUBLIC
-    batch_operator_plugin
-    sysio_testing
-    sysio_chain_wrap
-  )
-  add_test(
-    NAME test_plugin_common
-    COMMAND libraries/plugin_common/test/test_plugin_common
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-  )
-endif()
+plugin_target(
+        batch_operator_plugin
+        LIBRARIES
+        appbase
+        chainbase
+        chain_plugin
+        operator_plugin
+        sysio_chain)

plugins/chain_api_plugin/CMakeLists.txt

@@ -1,7 +1,7 @@
-file(GLOB HEADERS "include/sysio/chain_api_plugin/*.hpp")
-add_library( chain_api_plugin
-             chain_api_plugin.cpp
-             ${HEADERS} )
+plugin_target(
+        chain_api_plugin
+        LIBRARIES
+        chain_plugin
+        http_plugin
+        appbase)
 
-target_link_libraries( chain_api_plugin chain_plugin http_plugin appbase )
-target_include_directories( chain_api_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )

…ns/chain_api_plugin/chain_api_plugin.cpp …hain_api_plugin/src/chain_api_plugin.cppplugins/chain_api_plugin/chain_api_plugin.cpp renamed to plugins/chain_api_plugin/src/chain_api_plugin.cpp plugins/chain_api_plugin/chain_api_plugin.cpp renamed to plugins/chain_api_plugin/src/chain_api_plugin.cpp

@@ -1,23 +1,10 @@
-file(GLOB HEADERS "include/sysio/chain_plugin/*.hpp")
-add_library( chain_plugin
-             account_query_db.cpp
-             trx_finality_status_processing.cpp
-             chain_plugin.cpp
-             trx_retry_db.cpp
-             tracked_votes.cpp
-             get_info_db.cpp
-             ${HEADERS} )
 
-if(SYSIO_ENABLE_DEVELOPER_OPTIONS)
-    message(WARNING "SYSIO Developer Options are enabled; these are NOT supported")
-    target_compile_definitions(chain_plugin PUBLIC SYSIO_DEVELOPER)
-endif()
-
-target_link_libraries( chain_plugin producer_plugin sysio_chain custom_appbase appbase resource_monitor_plugin
+plugin_target( chain_plugin
+        LIBRARIES
+        producer_plugin
+        sysio_chain
+        custom_appbase
+        appbase
+        resource_monitor_plugin
         signature_provider_manager_plugin
-        Boost::bimap Boost::process
-        Boost::dll
-        Boost::multiprecision )
-target_include_directories( chain_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../chain_interface/include" "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/appbase/include" "${CMAKE_CURRENT_SOURCE_DIR}/../resource_monitor_plugin/include")
-
-add_subdirectory( test )
+ )