mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-13 00:31:14 +00:00
Add missing include directories for ZeroMQ and NanoMsg. They have been found by chance when the packages are in SIMPATH. They are not found if they are in another path.
This commit is contained in:
parent
8f59db1283
commit
af70d03ab0
|
@ -26,11 +26,19 @@ If(NANOMSG_FOUND)
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${NANOMSG_INCLUDE_DIR}
|
||||||
|
)
|
||||||
Else(NANOMSG_FOUND)
|
Else(NANOMSG_FOUND)
|
||||||
Set(INCLUDE_DIRECTORIES
|
Set(INCLUDE_DIRECTORIES
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${ZMQ_INCLUDE_DIR}
|
||||||
|
)
|
||||||
EndIf(NANOMSG_FOUND)
|
EndIf(NANOMSG_FOUND)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|
|
@ -26,11 +26,19 @@ If(NANOMSG_FOUND)
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${ZMQ_INCLUDE_DIR}
|
||||||
|
)
|
||||||
Else(NANOMSG_FOUND)
|
Else(NANOMSG_FOUND)
|
||||||
Set(INCLUDE_DIRECTORIES
|
Set(INCLUDE_DIRECTORIES
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${ZMQ_INCLUDE_DIR}
|
||||||
|
)
|
||||||
EndIf(NANOMSG_FOUND)
|
EndIf(NANOMSG_FOUND)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|
|
@ -31,11 +31,19 @@ If(NANOMSG_FOUND)
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${NANOMSG_INCLUDE_DIR}
|
||||||
|
)
|
||||||
Else(NANOMSG_FOUND)
|
Else(NANOMSG_FOUND)
|
||||||
Set(INCLUDE_DIRECTORIES
|
Set(INCLUDE_DIRECTORIES
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${ZMQ_INCLUDE_DIR}
|
||||||
|
)
|
||||||
EndIf(NANOMSG_FOUND)
|
EndIf(NANOMSG_FOUND)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|
|
@ -26,13 +26,22 @@ If(NANOMSG_FOUND)
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${ZMQ_INCLUDE_DIR}
|
||||||
|
)
|
||||||
Else(NANOMSG_FOUND)
|
Else(NANOMSG_FOUND)
|
||||||
Set(INCLUDE_DIRECTORIES
|
Set(INCLUDE_DIRECTORIES
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${ZMQ_INCLUDE_DIR}
|
||||||
|
)
|
||||||
EndIf(NANOMSG_FOUND)
|
EndIf(NANOMSG_FOUND)
|
||||||
|
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
|
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
|
||||||
|
|
||||||
|
|
|
@ -24,11 +24,19 @@ If(NANOMSG_FOUND)
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${ZMQ_INCLUDE_DIR}
|
||||||
|
)
|
||||||
Else(NANOMSG_FOUND)
|
Else(NANOMSG_FOUND)
|
||||||
Set(INCLUDE_DIRECTORIES
|
Set(INCLUDE_DIRECTORIES
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${ZMQ_INCLUDE_DIR}
|
||||||
|
)
|
||||||
EndIf(NANOMSG_FOUND)
|
EndIf(NANOMSG_FOUND)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|
|
@ -26,11 +26,19 @@ If(NANOMSG_FOUND)
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${ZMQ_INCLUDE_DIR}
|
||||||
|
)
|
||||||
Else(NANOMSG_FOUND)
|
Else(NANOMSG_FOUND)
|
||||||
Set(INCLUDE_DIRECTORIES
|
Set(INCLUDE_DIRECTORIES
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${ZMQ_INCLUDE_DIR}
|
||||||
|
)
|
||||||
EndIf(NANOMSG_FOUND)
|
EndIf(NANOMSG_FOUND)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|
|
@ -31,11 +31,19 @@ If(NANOMSG_FOUND)
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
${CMAKE_SOURCE_DIR}/fairmq/nanomsg
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${ZMQ_INCLUDE_DIR}
|
||||||
|
)
|
||||||
Else(NANOMSG_FOUND)
|
Else(NANOMSG_FOUND)
|
||||||
Set(INCLUDE_DIRECTORIES
|
Set(INCLUDE_DIRECTORIES
|
||||||
${INCLUDE_DIRECTORIES}
|
${INCLUDE_DIRECTORIES}
|
||||||
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
${CMAKE_SOURCE_DIR}/fairmq/zeromq
|
||||||
)
|
)
|
||||||
|
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||||
|
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||||
|
${ZMQ_INCLUDE_DIR}
|
||||||
|
)
|
||||||
EndIf(NANOMSG_FOUND)
|
EndIf(NANOMSG_FOUND)
|
||||||
|
|
||||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||||
|
|
Loading…
Reference in New Issue
Block a user