From b43d4c142d3b8f75b49d461ce9159b0f300059e4 Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Tue, 21 Feb 2017 23:03:22 +0100 Subject: [PATCH] refactor and integrate with aliBuild/alienv * accept ZEROMQ_ROOT as env or cmake variable to hint at install location (used by aliBuild/alienv) * added more docs * fixed mismatch between module name ZeroMQ and prefix of generated variables ZMQ -> ZeroMQ is now the preferred prefix (old variables are still available and marked deprecated) * the aliBuild zeromq recipe does not install zmq.hpp header, so the module searches now for the zmq.h header (which is anyways the only one we use) * some cosmetic changes * add option ZeroMQ_NO_DEPRECATION to suppress deprecation warning --- fairmq/CMakeLists.txt | 4 ++-- fairmq/test/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt index 25d45883..9bc6b1f0 100644 --- a/fairmq/CMakeLists.txt +++ b/fairmq/CMakeLists.txt @@ -25,7 +25,7 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} - ${ZMQ_INCLUDE_DIR} + ${ZeroMQ_INCLUDE_DIR} ) If(DDS_FOUND) @@ -124,7 +124,7 @@ Install(FILES ${FAIRMQHEADERS} DESTINATION include) Set(DEPENDENCIES ${DEPENDENCIES} - ${ZMQ_LIBRARY_SHARED} + ${ZeroMQ_LIBRARY_SHARED} ${Boost_THREAD_LIBRARY} dl fairmq_logger diff --git a/fairmq/test/CMakeLists.txt b/fairmq/test/CMakeLists.txt index c5f989a2..1a1b73a6 100644 --- a/fairmq/test/CMakeLists.txt +++ b/fairmq/test/CMakeLists.txt @@ -26,7 +26,7 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} - ${ZMQ_INCLUDE_DIR} + ${ZeroMQ_INCLUDE_DIR} ) If(NANOMSG_FOUND)