From 1bb72fea38b40f60039f5f176130e0867ddfa6e4 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Fri, 4 Dec 2015 15:18:46 +0100 Subject: [PATCH] Add FlatBuffers & MessagePack examples - Add FlatBuffers serialization example to Tutorial 3 - Add MessagePack serialization example to Tutorial 3 - Performance improvements in Boost serialization example - Use `GetEntriesFast()` for FairTestDetectorRecoTask - Use `Clear()` instead of `Delete()` in MQ parts of Tutorial 3 - Fix CMake variables from preventing compilation without nanomsg. - create macro/data directories in install directory - Get rid of data duplication in fill_parameters.C - Various cleanups and fixes --- examples/MQ/1-sampler-sink/CMakeLists.txt | 8 +++++++- examples/MQ/2-sampler-processor-sink/CMakeLists.txt | 8 +++++++- examples/MQ/3-dds/CMakeLists.txt | 8 +++++++- examples/MQ/4-copypush/CMakeLists.txt | 8 +++++++- examples/MQ/5-req-rep/CMakeLists.txt | 8 +++++++- examples/MQ/6-multiple-channels/CMakeLists.txt | 8 +++++++- examples/MQ/8-multipart/CMakeLists.txt | 8 +++++++- 7 files changed, 49 insertions(+), 7 deletions(-) diff --git a/examples/MQ/1-sampler-sink/CMakeLists.txt b/examples/MQ/1-sampler-sink/CMakeLists.txt index 02ff38f2..e7c02514 100644 --- a/examples/MQ/1-sampler-sink/CMakeLists.txt +++ b/examples/MQ/1-sampler-sink/CMakeLists.txt @@ -22,9 +22,15 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} ${ZMQ_INCLUDE_DIR} - ${NANOMSG_INCLUDE_DIR} ) +If(NANOMSG_FOUND) + Set(SYSTEM_INCLUDE_DIRECTORIES + ${SYSTEM_INCLUDE_DIRECTORIES} + ${NANOMSG_INCLUDE_DIR} + ) +EndIf(NANOMSG_FOUND) + Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/2-sampler-processor-sink/CMakeLists.txt b/examples/MQ/2-sampler-processor-sink/CMakeLists.txt index 44f99da1..8ebb5e93 100644 --- a/examples/MQ/2-sampler-processor-sink/CMakeLists.txt +++ b/examples/MQ/2-sampler-processor-sink/CMakeLists.txt @@ -22,9 +22,15 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} ${ZMQ_INCLUDE_DIR} - ${NANOMSG_INCLUDE_DIR} ) +If(NANOMSG_FOUND) + Set(SYSTEM_INCLUDE_DIRECTORIES + ${SYSTEM_INCLUDE_DIRECTORIES} + ${NANOMSG_INCLUDE_DIR} + ) +EndIf(NANOMSG_FOUND) + Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/3-dds/CMakeLists.txt b/examples/MQ/3-dds/CMakeLists.txt index f066232b..4eb1c7be 100644 --- a/examples/MQ/3-dds/CMakeLists.txt +++ b/examples/MQ/3-dds/CMakeLists.txt @@ -27,9 +27,15 @@ Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} ${DDS_INCLUDE_DIR} ${ZMQ_INCLUDE_DIR} - ${NANOMSG_INCLUDE_DIR} ) +If(NANOMSG_FOUND) + Set(SYSTEM_INCLUDE_DIRECTORIES + ${SYSTEM_INCLUDE_DIRECTORIES} + ${NANOMSG_INCLUDE_DIR} + ) +EndIf(NANOMSG_FOUND) + Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/4-copypush/CMakeLists.txt b/examples/MQ/4-copypush/CMakeLists.txt index 688fe16b..2e66b2b5 100644 --- a/examples/MQ/4-copypush/CMakeLists.txt +++ b/examples/MQ/4-copypush/CMakeLists.txt @@ -22,9 +22,15 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} ${ZMQ_INCLUDE_DIR} - ${NANOMSG_INCLUDE_DIR} ) +If(NANOMSG_FOUND) + Set(SYSTEM_INCLUDE_DIRECTORIES + ${SYSTEM_INCLUDE_DIRECTORIES} + ${NANOMSG_INCLUDE_DIR} + ) +EndIf(NANOMSG_FOUND) + Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/5-req-rep/CMakeLists.txt b/examples/MQ/5-req-rep/CMakeLists.txt index bcaeff59..c7519bbf 100644 --- a/examples/MQ/5-req-rep/CMakeLists.txt +++ b/examples/MQ/5-req-rep/CMakeLists.txt @@ -22,9 +22,15 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} ${ZMQ_INCLUDE_DIR} - ${NANOMSG_INCLUDE_DIR} ) +If(NANOMSG_FOUND) + Set(SYSTEM_INCLUDE_DIRECTORIES + ${SYSTEM_INCLUDE_DIRECTORIES} + ${NANOMSG_INCLUDE_DIR} + ) +EndIf(NANOMSG_FOUND) + Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/6-multiple-channels/CMakeLists.txt b/examples/MQ/6-multiple-channels/CMakeLists.txt index 22441560..a99e98ea 100644 --- a/examples/MQ/6-multiple-channels/CMakeLists.txt +++ b/examples/MQ/6-multiple-channels/CMakeLists.txt @@ -22,9 +22,15 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} ${ZMQ_INCLUDE_DIR} - ${NANOMSG_INCLUDE_DIR} ) +If(NANOMSG_FOUND) + Set(SYSTEM_INCLUDE_DIRECTORIES + ${SYSTEM_INCLUDE_DIRECTORIES} + ${NANOMSG_INCLUDE_DIR} + ) +EndIf(NANOMSG_FOUND) + Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) diff --git a/examples/MQ/8-multipart/CMakeLists.txt b/examples/MQ/8-multipart/CMakeLists.txt index eeefc0ec..8597e562 100644 --- a/examples/MQ/8-multipart/CMakeLists.txt +++ b/examples/MQ/8-multipart/CMakeLists.txt @@ -22,9 +22,15 @@ Set(INCLUDE_DIRECTORIES Set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} ${ZMQ_INCLUDE_DIR} - ${NANOMSG_INCLUDE_DIR} ) +If(NANOMSG_FOUND) + Set(SYSTEM_INCLUDE_DIRECTORIES + ${SYSTEM_INCLUDE_DIRECTORIES} + ${NANOMSG_INCLUDE_DIR} + ) +EndIf(NANOMSG_FOUND) + Include_Directories(${INCLUDE_DIRECTORIES}) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})