diff --git a/devices/aliceHLTwrapper/CMakeLists.txt b/devices/aliceHLTwrapper/CMakeLists.txt
index c67bcc14ad833..6e583e9ddfceb 100644
--- a/devices/aliceHLTwrapper/CMakeLists.txt
+++ b/devices/aliceHLTwrapper/CMakeLists.txt
@@ -64,11 +64,21 @@ set(DEPENDENCIES
     # ${ZMQ_LIBRARY_SHARED}
   )
 
-set(DEPENDENCIES
-  ${DEPENDENCIES}
-#  ${CMAKE_THREAD_LIBS_INIT}
-   boost_thread boost_system boost_chrono FairMQ
-)
+if(FAIRMQ_DEPENDENCIES)
+  set(DEPENDENCIES
+    ${DEPENDENCIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${FAIRMQ_DEPENDENCIES}
+    boost_chrono
+    FairMQ
+  )
+else(FAIRMQ_DEPENDENCIES)
+  set(DEPENDENCIES
+    ${DEPENDENCIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    boost_chrono boost_date_time boost_thread boost_timer boost_system boost_program_options FairMQ
+  )
+endif(FAIRMQ_DEPENDENCIES)
 
 set(LIBRARY_NAME ALICEHLT)
 
diff --git a/devices/flp2epn-distributed/CMakeLists.txt b/devices/flp2epn-distributed/CMakeLists.txt
index c04de292c0d3c..cbaf0957dc700 100644
--- a/devices/flp2epn-distributed/CMakeLists.txt
+++ b/devices/flp2epn-distributed/CMakeLists.txt
@@ -55,11 +55,20 @@ set(SRCS
   EPNReceiver.cxx
 )
 
-set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${CMAKE_THREAD_LIBS_INIT}
-  boost_date_time boost_thread boost_timer boost_system boost_program_options FairMQ
-)
+if(FAIRMQ_DEPENDENCIES)
+  set(DEPENDENCIES
+    ${DEPENDENCIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${FAIRMQ_DEPENDENCIES}
+    FairMQ
+  )
+else(FAIRMQ_DEPENDENCIES)
+  set(DEPENDENCIES
+    ${DEPENDENCIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    boost_date_time boost_thread boost_timer boost_system boost_program_options boost_chrono FairMQ
+  )
+endif(FAIRMQ_DEPENDENCIES)
 
 if(DDS_LOCATION)
   set(DEPENDENCIES
diff --git a/devices/flp2epn-dynamic/CMakeLists.txt b/devices/flp2epn-dynamic/CMakeLists.txt
index c6d07842dda8f..ea0fb17badfe6 100644
--- a/devices/flp2epn-dynamic/CMakeLists.txt
+++ b/devices/flp2epn-dynamic/CMakeLists.txt
@@ -27,11 +27,20 @@ set(SRCS
   O2EPNex.cxx
 )
 
-set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${CMAKE_THREAD_LIBS_INIT}
-  boost_date_time boost_thread boost_timer boost_system boost_program_options FairMQ
-)
+if(FAIRMQ_DEPENDENCIES)
+  set(DEPENDENCIES
+    ${DEPENDENCIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${FAIRMQ_DEPENDENCIES}
+    FairMQ
+  )
+else(FAIRMQ_DEPENDENCIES)
+  set(DEPENDENCIES
+    ${DEPENDENCIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    boost_date_time boost_thread boost_timer boost_system boost_program_options boost_chrono FairMQ
+  )
+endif(FAIRMQ_DEPENDENCIES)
 
 set(LIBRARY_NAME FLP2EPNex_dynamic)
 
diff --git a/devices/flp2epn/CMakeLists.txt b/devices/flp2epn/CMakeLists.txt
index 47cf5c76988ff..95c654203df63 100644
--- a/devices/flp2epn/CMakeLists.txt
+++ b/devices/flp2epn/CMakeLists.txt
@@ -32,11 +32,20 @@ set(SRCS
   O2EpnMerger.cxx
 )
 
-set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${CMAKE_THREAD_LIBS_INIT}
-  boost_thread boost_timer boost_system boost_program_options FairMQ
-)
+if(FAIRMQ_DEPENDENCIES)
+  set(DEPENDENCIES
+    ${DEPENDENCIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${FAIRMQ_DEPENDENCIES}
+    FairMQ
+  )
+else(FAIRMQ_DEPENDENCIES)
+  set(DEPENDENCIES
+    ${DEPENDENCIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    boost_date_time boost_thread boost_timer boost_system boost_program_options boost_chrono FairMQ
+  )
+endif(FAIRMQ_DEPENDENCIES)
 
 set(LIBRARY_NAME FLP2EPNex)
 
diff --git a/devices/roundtrip/CMakeLists.txt b/devices/roundtrip/CMakeLists.txt
index a5129d982aa0b..34bc16def7ab3 100644
--- a/devices/roundtrip/CMakeLists.txt
+++ b/devices/roundtrip/CMakeLists.txt
@@ -30,11 +30,20 @@ set(SRCS
   RoundtripServer.cxx
 )
 
-set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${CMAKE_THREAD_LIBS_INIT}
-  boost_date_time boost_thread boost_timer boost_system boost_program_options FairMQ
-)
+if(FAIRMQ_DEPENDENCIES)
+  set(DEPENDENCIES
+    ${DEPENDENCIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${FAIRMQ_DEPENDENCIES}
+    FairMQ
+  )
+else(FAIRMQ_DEPENDENCIES)
+  set(DEPENDENCIES
+    ${DEPENDENCIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    boost_date_time boost_thread boost_timer boost_system boost_program_options boost_chrono FairMQ
+  )
+endif(FAIRMQ_DEPENDENCIES)
 
 set(LIBRARY_NAME RoundtripTest)