From 3e013f98b8cbb62caf97a073545c3b9ef643aea0 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 --- examples/MQ/1-sampler-sink/CMakeLists.txt | 2 +- examples/MQ/2-sampler-processor-sink/CMakeLists.txt | 2 +- examples/MQ/3-dds/CMakeLists.txt | 2 +- examples/MQ/4-copypush/CMakeLists.txt | 2 +- examples/MQ/5-req-rep/CMakeLists.txt | 2 +- examples/MQ/6-multiple-channels/CMakeLists.txt | 2 +- examples/MQ/8-multipart/CMakeLists.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/MQ/1-sampler-sink/CMakeLists.txt b/examples/MQ/1-sampler-sink/CMakeLists.txt index 6d429726..ae5c904a 100644 --- a/examples/MQ/1-sampler-sink/CMakeLists.txt +++ b/examples/MQ/1-sampler-sink/CMakeLists.txt @@ -22,7 +22,7 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} - ${ZMQ_INCLUDE_DIR} + ${ZeroMQ_INCLUDE_DIR} ) Include_Directories(${INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/2-sampler-processor-sink/CMakeLists.txt b/examples/MQ/2-sampler-processor-sink/CMakeLists.txt index 0222f97a..b346faaf 100644 --- a/examples/MQ/2-sampler-processor-sink/CMakeLists.txt +++ b/examples/MQ/2-sampler-processor-sink/CMakeLists.txt @@ -22,7 +22,7 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} - ${ZMQ_INCLUDE_DIR} + ${ZeroMQ_INCLUDE_DIR} ) Include_Directories(${INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/3-dds/CMakeLists.txt b/examples/MQ/3-dds/CMakeLists.txt index 71145e20..ad63fca9 100644 --- a/examples/MQ/3-dds/CMakeLists.txt +++ b/examples/MQ/3-dds/CMakeLists.txt @@ -25,7 +25,7 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${SYSTEM_INCLUDE_DIRECTORIES} ${Boost_INCLUDE_DIR} - ${ZMQ_INCLUDE_DIR} + ${ZeroMQ_INCLUDE_DIR} ) Include_Directories(${INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/4-copypush/CMakeLists.txt b/examples/MQ/4-copypush/CMakeLists.txt index b3f5b60f..6ecba16a 100644 --- a/examples/MQ/4-copypush/CMakeLists.txt +++ b/examples/MQ/4-copypush/CMakeLists.txt @@ -22,7 +22,7 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} - ${ZMQ_INCLUDE_DIR} + ${ZeroMQ_INCLUDE_DIR} ) Include_Directories(${INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/5-req-rep/CMakeLists.txt b/examples/MQ/5-req-rep/CMakeLists.txt index 169f4186..dd590ee7 100644 --- a/examples/MQ/5-req-rep/CMakeLists.txt +++ b/examples/MQ/5-req-rep/CMakeLists.txt @@ -22,7 +22,7 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} - ${ZMQ_INCLUDE_DIR} + ${ZeroMQ_INCLUDE_DIR} ) Include_Directories(${INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/6-multiple-channels/CMakeLists.txt b/examples/MQ/6-multiple-channels/CMakeLists.txt index 581d04a4..e421fb9f 100644 --- a/examples/MQ/6-multiple-channels/CMakeLists.txt +++ b/examples/MQ/6-multiple-channels/CMakeLists.txt @@ -22,7 +22,7 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} - ${ZMQ_INCLUDE_DIR} + ${ZeroMQ_INCLUDE_DIR} ) Include_Directories(${INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/8-multipart/CMakeLists.txt b/examples/MQ/8-multipart/CMakeLists.txt index 8ddd0729..37e67804 100644 --- a/examples/MQ/8-multipart/CMakeLists.txt +++ b/examples/MQ/8-multipart/CMakeLists.txt @@ -22,7 +22,7 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} - ${ZMQ_INCLUDE_DIR} + ${ZeroMQ_INCLUDE_DIR} ) Include_Directories(${INCLUDE_DIRECTORIES})