From c40c429581c1d51b793fd256971f546d6dd177cb Mon Sep 17 00:00:00 2001 From: Frank Dana Date: Wed, 30 Oct 2019 04:50:24 -0400 Subject: [PATCH 1/2] Delete FindZMQ.cmake (This also serves as a test of the GitHub Actions config.) --- cmake/Modules/FindZMQ.cmake | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 cmake/Modules/FindZMQ.cmake diff --git a/cmake/Modules/FindZMQ.cmake b/cmake/Modules/FindZMQ.cmake deleted file mode 100644 index 50d27bc54..000000000 --- a/cmake/Modules/FindZMQ.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# - Try to find ZMQ -# Once done this will define -# ZMQ_FOUND - System has ZMQ -# ZMQ_INCLUDE_DIRS - The ZMQ include directories -# ZMQ_LIBRARIES - The libraries needed to use ZMQ -# ZMQ_DEFINITIONS - Compiler switches required for using ZMQ - -find_path ( ZMQ_INCLUDE_DIR zmq.h - PATHS /usr/include/ - /usr/local/include/ - $ENV{ZMQDIR}/include/ ) - -find_library ( ZMQ_LIBRARY NAMES zmq - PATHS /usr/lib/ - /usr/local/lib/ - $ENV{ZMQDIR}/lib/ ) - -set ( ZMQ_LIBRARIES ${ZMQ_LIBRARY} ) -set ( ZMQ_INCLUDE_DIRS ${ZMQ_INCLUDE_DIR} ) - -include ( FindPackageHandleStandardArgs ) -# handle the QUIETLY and REQUIRED arguments and set ZMQ_FOUND to TRUE -# if all listed variables are TRUE -find_package_handle_standard_args ( ZMQ DEFAULT_MSG ZMQ_LIBRARY ZMQ_INCLUDE_DIR ) \ No newline at end of file From b5ab66328f53cf64c19d1a1cfda69bc4c8a3b429 Mon Sep 17 00:00:00 2001 From: Frank Dana Date: Wed, 30 Oct 2019 04:58:42 -0400 Subject: [PATCH 2/2] Update CMakeLists.txt --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 566fa9daf..4a9d36473 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -128,10 +128,10 @@ ENDIF (ENABLE_BLACKMAGIC) # Some platforms package the header-only cppzmq C++ bindings separately, # others (Ubuntu) bundle them in with libzmq itself find_package(cppzmq QUIET) -find_package(ZMQ REQUIRED) +find_package(ZeroMQ REQUIRED) # Include ZeroMQ headers (needed for compile) -include_directories(${ZMQ_INCLUDE_DIRS}) +include_directories(${ZeroMQ_INCLUDE_DIRS}) if (cppzmq_FOUND) include_directories(${cppzmq_INCLUDE_DIRS}) endif()