feat: Drop public bundled dependency to asio

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "extern/googletest"]
 	path = extern/googletest
 	url = https://github.com/google/googletest
-[submodule "extern/asio"]
-	path = extern/asio
-	url = https://github.com/FairRootGroup/asio
 [submodule "extern/PicoSHA2"]
 	path = extern/PicoSHA2
 	url = https://github.com/okdshin/PicoSHA2

CMakeLists.txt

@@ -121,11 +121,6 @@ if(BUILD_DOCS)
     DESTINATION ${PROJECT_INSTALL_DATADIR}/docs
   )
 endif()
-if(BUILD_FAIRMQ OR BUILD_SDK)
-  if(asio_BUNDLED)
-    install_bundled(asio)
-  endif()
-endif()
 
 include(FairMQPackage)
 install_cmake_package()

cmake/FairMQBundlePackageHelper.cmake

@@ -71,16 +71,6 @@ function(build_bundled package bundle)
     )
     exec(${CMAKE_COMMAND} --build ${${package}_BINARY_DIR})
     exec(${CMAKE_COMMAND} --build ${${package}_BINARY_DIR} --target install)
-  elseif(${package} STREQUAL asio)
-    set(${package}_INSTALL_DIR ${CMAKE_BINARY_DIR}/${bundle}_install)
-    file(MAKE_DIRECTORY ${${package}_INSTALL_DIR})
-    set(${package}_PREFIX ${${package}_INSTALL_DIR})
-
-    exec(${CMAKE_COMMAND} -S ${${package}_SOURCE_DIR} -B ${${package}_BINARY_DIR} -G ${CMAKE_GENERATOR}
-      -DCMAKE_INSTALL_PREFIX=${${package}_INSTALL_DIR}
-    )
-    exec(${CMAKE_COMMAND} --build ${${package}_BINARY_DIR})
-    exec(${CMAKE_COMMAND} --build ${${package}_BINARY_DIR} --target install)
   elseif(${package} STREQUAL FairCMakeModules)
     set(${package}_INSTALL_DIR ${CMAKE_BINARY_DIR}/${bundle}_install)
     file(MAKE_DIRECTORY ${${package}_INSTALL_DIR})
@@ -100,39 +90,3 @@ function(build_bundled package bundle)
 
   message(STATUS "Building bundled ${package} - done")
 endfunction()
-
-# TODO Eventually retire supporting PUBLIC bundled packages.
-macro(install_bundled package)
-  if(${package} STREQUAL asio)
-    add_library(bundled_asio_headers INTERFACE)
-    target_include_directories(bundled_asio_headers INTERFACE
-      $<BUILD_INTERFACE:${asio_ROOT}/${CMAKE_INSTALL_INCLUDEDIR}>
-      $<INSTALL_INTERFACE:${PROJECT_INSTALL_INCDIR}/bundled>
-    )
-    install(TARGETS bundled_asio_headers EXPORT ${PROJECT_EXPORT_SET})
-    install(DIRECTORY "${asio_ROOT}/${CMAKE_INSTALL_INCLUDEDIR}/asio"
-      DESTINATION ${PROJECT_INSTALL_INCDIR}/bundled
-    )
-    install(FILES "${asio_ROOT}/${CMAKE_INSTALL_INCLUDEDIR}/asio.hpp"
-      DESTINATION ${PROJECT_INSTALL_INCDIR}/bundled
-    )
-  endif()
-endmacro()
-
-# TODO Eventually retire supporting PUBLIC bundled packages.
-function(fairmq_generate_bundled_packages)
-  if(asio_BUNDLED)
-  set(BUNDLED_PACKAGES "\
-####### Expanded from @BUNDLED_PACKAGES@ by configure_package_config_file() #########
-
-if(\"\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}\" VERSION_LESS 3.11)
-   message(FATAL_ERROR \"CMake >= 3.11 required\")
-endif()
-set_target_properties(${PROJECT_NAME}::bundled_asio_headers PROPERTIES IMPORTED_GLOBAL TRUE)
-add_library(asio::asio ALIAS ${PROJECT_NAME}::bundled_asio_headers)
-set(asio_VERSION ${asio_VERSION})
-
-")
-  endif()
-set(BUNDLED_PACKAGES ${BUNDLED_PACKAGES} PARENT_SCOPE)
-endfunction()

cmake/FairMQConfig.cmake.in

@@ -33,6 +33,4 @@ set(CMAKE_MODULE_PATH ${@PROJECT_NAME@_CMAKEMODDIR} ${CMAKE_MODULE_PATH})
 ### Import targets
 include(@PACKAGE_CMAKE_INSTALL_PREFIX@/@PACKAGE_INSTALL_DESTINATION@/@PROJECT_EXPORT_SET@.cmake)
 
-@BUNDLED_PACKAGES@
-
 @PACKAGE_COMPONENTS@

cmake/FairMQDependencies.cmake

@@ -42,13 +42,10 @@ if(BUILD_FAIRMQ OR BUILD_SDK)
   find_package2(PUBLIC Boost REQUIRED VERSION 1.66
     COMPONENTS container program_options filesystem date_time regex
   )
-  set(__asio_version 1.18.1)
-  find_package2(BUNDLED asio VERSION ${__asio_version})
-  if(NOT asio_FOUND AND NOT asio_BUNDLED)
-    build_bundled(asio extern/asio)
-    find_package2(BUNDLED asio REQUIRED VERSION ${__asio_version})
 endif()
-  unset(__asio_version)
+
+if(BUILD_OFI_TRANSPORT OR BUILD_SDK OR BUILD_DDS_PLUGIN)
+  find_package2(PUBLIC asio REQUIRED VERSION 1.18)
 endif()
 
 if(BUILD_FAIRMQ)

cmake/FairMQPackage.cmake

@@ -54,7 +54,6 @@ macro(install_cmake_package)
   )
   fair_generate_package_dependencies() # fills ${PACKAGE_DEPENDENCIES}
   generate_package_components() # fills ${PACKAGE_COMPONENTS}
-  fairmq_generate_bundled_packages() # fills ${BUNDLED_PACKAGES}
   string(TOUPPER ${CMAKE_BUILD_TYPE} PROJECT_BUILD_TYPE_UPPER)
   set(PROJECT_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${PROJECT_BUILD_TYPE_UPPER}})
   configure_package_config_file(

extern/asio

@@ -1 +0,0 @@
-Subproject commit fdabf904b0a54222dbc907520a0c1581f54c4173

fairmq/CMakeLists.txt

@@ -59,8 +59,6 @@ if(BUILD_FAIRMQ OR BUILD_SDK)
     FairLogger::FairLogger
     Threads::Threads
     Boost::boost
-    PUBLIC
-    asio::asio
   )
   set_target_properties(${target} PROPERTIES
     VERSION ${PROJECT_VERSION}
@@ -298,6 +296,7 @@ if(BUILD_FAIRMQ)
   ##################
   if(BUILD_OFI_TRANSPORT)
     set(OFI_DEPS
+      asio::asio
       asiofi::asiofi
     )
   endif()