From 54b7742d853c77acec45e4134c4d85ba5fb6e14d Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Wed, 20 Mar 2019 18:02:42 +0100 Subject: [PATCH] Drop obsolete dependency to AZMQ --- CMakeLists.txt | 7 ------ README.md | 4 +-- cmake/FindAZMQ.cmake | 57 ------------------------------------------- fairmq/CMakeLists.txt | 1 - 4 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 cmake/FindAZMQ.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a9d1222..643f9b80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,8 +67,6 @@ if(BUILD_OFI_TRANSPORT) VERSION ${asiofi_OFI_VERSION} COMPONENTS ${asiofi_OFI_COMPONENTS} ) - find_package2(PRIVATE AZMQ REQUIRED) - set(PROJECT_AZMQ_VERSION 1.0.2) endif() if(BUILD_NANOMSG_TRANSPORT) @@ -194,11 +192,6 @@ if(BUILD_DDS_PLUGIN) DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR} ) endif() -if(BUILD_OFI_TRANSPORT) - install(FILES cmake/FindAZMQ.cmake - DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR} - ) -endif() if(BUILD_DOCS) install(DIRECTORY ${CMAKE_BINARY_DIR}/doxygen/html DESTINATION ${PROJECT_INSTALL_DATADIR}/docs diff --git a/README.md b/README.md index 0b1d6719..0e2ea373 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ a simulation, reconstruction and analysis framework. * PUBLIC: [**Boost**](https://www.boost.org/), [**FairLogger**](https://github.com/FairRootGroup/FairLogger) * BUILD: [CMake](https://cmake.org/), [GTest](https://github.com/google/googletest), [Doxygen](http://www.doxygen.org/) * PRIVATE: [ZeroMQ](http://zeromq.org/), [Msgpack](https://msgpack.org/index.html), [nanomsg](http://nanomsg.org/), -[asiofi](https://github.com/FairRootGroup/asiofi), [DDS](http://dds.gsi.de), [PMIx](https://pmix.org/), [AZMQ](https://github.com/zeromq/azmq), [asiofi](https://github.com/FairRootGroup/asiofi) +[asiofi](https://github.com/FairRootGroup/asiofi), [DDS](http://dds.gsi.de), [PMIx](https://pmix.org/) Supported platforms: Linux and MacOS. @@ -51,7 +51,7 @@ cmake -DCMAKE_INSTALL_PREFIX=./fairmq_install ../fairmq cmake --build . --target install ``` -If dependencies are not installed in standard system directories, you can hint the installation location via `-DCMAKE_PREFIX_PATH=...` or per dependency via `-D{DEPENDENCY}_ROOT=...`. `{DEPENDENCY}` can be `GTEST`, `BOOST`, `FAIRLOGGER`, `ZEROMQ`, `MSGPACK`, `NANOMSG`, `OFI`, `PMIX`, `ASIOFI`, `AZMQ` or `DDS` (`*_ROOT` variables can also be environment variables). +If dependencies are not installed in standard system directories, you can hint the installation location via `-DCMAKE_PREFIX_PATH=...` or per dependency via `-D{DEPENDENCY}_ROOT=...`. `{DEPENDENCY}` can be `GTEST`, `BOOST`, `FAIRLOGGER`, `ZEROMQ`, `MSGPACK`, `NANOMSG`, `OFI`, `PMIX`, `ASIOFI` or `DDS` (`*_ROOT` variables can also be environment variables). ## Usage diff --git a/cmake/FindAZMQ.cmake b/cmake/FindAZMQ.cmake deleted file mode 100644 index e4085033..00000000 --- a/cmake/FindAZMQ.cmake +++ /dev/null @@ -1,57 +0,0 @@ -################################################################################ -# Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH # -# # -# This software is distributed under the terms of the # -# GNU Lesser General Public Licence (LGPL) version 3, # -# copied verbatim in the file "LICENSE" # -################################################################################ -# -# ########################### -# # Locate the AZMQ library # -# ########################### -# -# -# Usage: -# -# find_package(AZMQ [version] [QUIET] [REQUIRED]) -# -# -# Defines the following variables: -# -# AZMQ_FOUND - Found the ZeroMQ library -# AZMQ_INCLUDE_DIR (CMake cache) - Include directory -# -# -# Accepts the following variables as hints for installation directories: -# -# AZMQ_ROOT (CMake var, ENV var) -# -# -# If the above variables are not defined, or if ZeroMQ could not be found there, -# it will look for it in the system directories. Custom ZeroMQ installations -# will always have priority over system ones. -# - -if(NOT AZMQ_ROOT) - set(AZMQ_ROOT $ENV{AZMQ_ROOT}) -endif() - -find_path(AZMQ_INCLUDE_DIR - NAMES azmq/socket.hpp - HINTS ${AZMQ_ROOT} $ENV{AZMQ_ROOT} - PATH_SUFFIXES include - DOC "AZMQ include directory" -) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(AZMQ - REQUIRED_VARS AZMQ_INCLUDE_DIR -) - -if(AZMQ_FOUND AND NOT TARGET AZMQ::AZMQ) - add_library(AZMQ::AZMQ INTERFACE IMPORTED) - set_target_properties(AZMQ::AZMQ PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES ${AZMQ_INCLUDE_DIR} - INTERFACE_LINK_LIBRARIES "libzmq;Boost::boost;Boost::container;Boost::system" - ) -endif() diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt index 73024ef6..cec4697b 100644 --- a/fairmq/CMakeLists.txt +++ b/fairmq/CMakeLists.txt @@ -224,7 +224,6 @@ if(BUILD_OFI_TRANSPORT) set(OFI_DEPS asiofi::asiofi Boost::container - AZMQ::AZMQ ) endif() set(optional_deps ${NANOMSG_DEPS} ${OFI_DEPS})