Fix compatibility with Boost >= 1.87

Author: jp-pino

.github/workflows/cmake-superbuild/CMakeLists.txt

@@ -85,13 +85,15 @@ if (NOT (BOOST_URL STREQUAL "system"))
     list(APPEND LIBS boost)
 endif ()
 
-if (POLICY CMP0167)
-  cmake_policy(SET CMP0167 NEW)
+cmake_policy(GET CMP0167 _cmp0167_value)
+if(_cmp0167_value)
+  set(_policy_arg "-DCMAKE_POLICY_DEFAULT_CMP0167=${_cmp0167_value}")
+  message(STATUS " Setting superbuild CMP0167 to ${_cmp0167_value} ")
 endif()
 
 ExternalProject_Add(
     azmq
     DEPENDS ${LIBS}
-    CMAKE_ARGS ${CMAKE_ARGS} -D AZMQ_BUILD_TESTS=YES
+    CMAKE_ARGS ${CMAKE_ARGS} -D AZMQ_BUILD_TESTS=YES ${_policy_arg}
     SOURCE_DIR ${CMAKE_SOURCE_DIR}/../../..
     TEST_BEFORE_INSTALL YES)

.github/workflows/cmake.yml

@@ -39,27 +39,35 @@ jobs:
           - url: system
             system_packages_ubuntu: libboost-all-dev
             system_packages_macos: boost
+            extra_cmake_args: -DCMAKE_POLICY_DEFAULT_CMP0167=NEW
           - url: BOOST_189
             system_packages_ubuntu: 
             system_packages_macos: 
+            extra_cmake_args: -DCMAKE_POLICY_DEFAULT_CMP0167=NEW
           - url: BOOST_187
             system_packages_ubuntu: 
             system_packages_macos:  
+            extra_cmake_args: -DCMAKE_POLICY_DEFAULT_CMP0167=NEW
           - url: BOOST_184
             system_packages_ubuntu: 
             system_packages_macos: 
+            extra_cmake_args: -DCMAKE_POLICY_DEFAULT_CMP0167=NEW
           - url: BOOST_176
             system_packages_ubuntu: 
             system_packages_macos: 
+            extra_cmake_args: -DCMAKE_POLICY_DEFAULT_CMP0167=NEW
           - url: BOOST_174
             system_packages_ubuntu: 
             system_packages_macos: 
+            extra_cmake_args: -DCMAKE_POLICY_DEFAULT_CMP0167=NEW
           - url: BOOST_170
             system_packages_ubuntu: 
             system_packages_macos: 
+            extra_cmake_args: -DCMAKE_POLICY_DEFAULT_CMP0167=NEW
           - url: BOOST_168
             system_packages_ubuntu: 
             system_packages_macos: 
+            extra_cmake_args: -DCMAKE_POLICY_DEFAULT_CMP0167=OLD
         zmq: 
           - tag: system
             system_packages_ubuntu: libzmq3-dev

.gitignore

@@ -13,3 +13,9 @@
 *.a
 *.pyc
 build/*
+build_*/*
+
+# Other files
+.devcontainer
+.vscode
+.DS_Store

AUTHORS

@@ -6,3 +6,4 @@ Thomas W Rodgers <rodgert@twrodgers.com>
 Andrey Upadyshev <oliora@gmail.com>
 Tim Blechmann <tim@klingt.org>
 Adam Boseley <adam.boseley@gmail.com>
+Juan Pablo Pino <jp.pinob@gmail.com>

CMakeLists.txt

@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.16.3...3.25)
-# -- v3.16.3 is the default version in the current ubuntu lts release
+cmake_minimum_required(VERSION 3.22.1...3.29.2)
+# -- v3.22.1 is the default version in the current ubuntu lts release
 
 project(azmq VERSION 1.1.0 LANGUAGES CXX)
 
@@ -21,13 +21,18 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 # --- dependencies  --
 find_package(
     Boost 1.68
-    COMPONENTS system
-               date_time
+    COMPONENTS date_time
                thread
                chrono
                random
     REQUIRED)
 
+# Try to find Boost::system
+find_package(Boost COMPONENTS system)
+if (NOT Boost_SYSTEM_FOUND)
+    message(WARNING "Boost::system not found, some examples may not compile")
+endif()
+
 include(FindAzmqLibzmq.cmake)
 
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
@@ -37,7 +42,7 @@ find_package(Threads REQUIRED)
 add_library(${PROJECT_NAME} INTERFACE)
 add_library(Azmq::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
-target_link_libraries(${PROJECT_NAME} INTERFACE Azmq::libzmq Boost::boost ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(${PROJECT_NAME} INTERFACE Azmq::libzmq Boost::boost ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
 target_include_directories(${PROJECT_NAME} INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
                                                      "$<INSTALL_INTERFACE:include>")
 

README.md

@@ -29,7 +29,7 @@ which supports C++11. Currently this has been tested with -
 * Microsoft Visual Studio 2013 on Windows Server 2008 R2
 
 Library dependencies are -
-* Boost 1.48 or later
+* Boost 1.68 or later
 * ZeroMQ 4.0.x
 
 Tests and example code require -

azmq/actor.hpp

@@ -12,7 +12,7 @@
 #include "socket.hpp"
 #include "detail/actor_service.hpp"
 
-#include <boost/asio/io_service.hpp>
+#include "io_service.hpp"
 
 #include <functional>
 
@@ -78,4 +78,3 @@ AZMQ_V1_INLINE_NAMESPACE_END
 } // namespace actor
 } // namespace azmq
 #endif // AZMQ_ACTOR_HPP_
-

azmq/context.hpp

@@ -12,8 +12,7 @@
 #include "detail/socket_service.hpp"
 #include "option.hpp"
 #include "error.hpp"
-
-#include <boost/asio/io_service.hpp>
+#include "io_service.hpp"
 #include <zmq.h>
 
 namespace azmq {

azmq/detail/actor_service.hpp

@@ -50,7 +50,7 @@ namespace detail {
             : azmq::detail::service_base<actor_service>(ios)
         { }
 
-        void shutdown_service() override { }
+        void shutdown() override { }
 
         using is_alive = opt::boolean<static_cast<int>(opt::limits::lib_actor_min)>;
         using detached = opt::boolean<static_cast<int>(opt::limits::lib_actor_min) + 1>;
@@ -286,4 +286,3 @@ namespace detail {
 } // namespace detail
 } // namespace azmq
 #endif // AZMQ_DETAIL_ACTOR_SERVICE_HPP_
-

azmq/detail/basic_io_object.hpp

@@ -9,7 +9,7 @@
 #ifndef AZMQ_DETAIL_BASIC_IO_OBJECT_HPP__
 #define AZMQ_DETAIL_BASIC_IO_OBJECT_HPP__
 
-#include <boost/asio/io_service.hpp>
+#include "../io_service.hpp"
 #include <boost/asio/basic_io_object.hpp>
 
 namespace azmq {
@@ -48,4 +48,3 @@ namespace detail {
 } // namespace detail
 } // namespace azmq
 #endif // AZMQ_DETAIL_BASIC_IO_OBJECT_HPP__
-