mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-12-15 07:20:17 +00:00
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
This commit is contained in:
committed by
Mohammad Al-Turany
parent
8defd77b63
commit
3e013f98b8
@@ -22,7 +22,7 @@ Set(INCLUDE_DIRECTORIES
|
|||||||
|
|
||||||
Set(SYSTEM_INCLUDE_DIRECTORIES
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
${Boost_INCLUDE_DIR}
|
${Boost_INCLUDE_DIR}
|
||||||
${ZMQ_INCLUDE_DIR}
|
${ZeroMQ_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ Set(INCLUDE_DIRECTORIES
|
|||||||
|
|
||||||
Set(SYSTEM_INCLUDE_DIRECTORIES
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
${Boost_INCLUDE_DIR}
|
${Boost_INCLUDE_DIR}
|
||||||
${ZMQ_INCLUDE_DIR}
|
${ZeroMQ_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ Set(INCLUDE_DIRECTORIES
|
|||||||
Set(SYSTEM_INCLUDE_DIRECTORIES
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
${SYSTEM_INCLUDE_DIRECTORIES}
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
${Boost_INCLUDE_DIR}
|
${Boost_INCLUDE_DIR}
|
||||||
${ZMQ_INCLUDE_DIR}
|
${ZeroMQ_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ Set(INCLUDE_DIRECTORIES
|
|||||||
|
|
||||||
Set(SYSTEM_INCLUDE_DIRECTORIES
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
${Boost_INCLUDE_DIR}
|
${Boost_INCLUDE_DIR}
|
||||||
${ZMQ_INCLUDE_DIR}
|
${ZeroMQ_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ Set(INCLUDE_DIRECTORIES
|
|||||||
|
|
||||||
Set(SYSTEM_INCLUDE_DIRECTORIES
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
${Boost_INCLUDE_DIR}
|
${Boost_INCLUDE_DIR}
|
||||||
${ZMQ_INCLUDE_DIR}
|
${ZeroMQ_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ Set(INCLUDE_DIRECTORIES
|
|||||||
|
|
||||||
Set(SYSTEM_INCLUDE_DIRECTORIES
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
${Boost_INCLUDE_DIR}
|
${Boost_INCLUDE_DIR}
|
||||||
${ZMQ_INCLUDE_DIR}
|
${ZeroMQ_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ Set(INCLUDE_DIRECTORIES
|
|||||||
|
|
||||||
Set(SYSTEM_INCLUDE_DIRECTORIES
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
${Boost_INCLUDE_DIR}
|
${Boost_INCLUDE_DIR}
|
||||||
${ZMQ_INCLUDE_DIR}
|
${ZeroMQ_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|||||||
Reference in New Issue
Block a user