Geometry for run3 implemented with updated TDI

[u/mrichter/AliRoot.git] / cmake / FindZeroMQ.cmake

diff --git a/cmake/FindZeroMQ.cmake b/cmake/FindZeroMQ.cmake
index 275b75912df44e153c6e3e2d6e9bf33a89523c0d..60adaccfa01cd038f89dd1781f8b8ff697be22c7 100644 (file)
--- a/cmake/FindZeroMQ.cmake
+++ b/cmake/FindZeroMQ.cmake
@@ -17,7 +17,6 @@
 # ZeroMQ custom installation can be pointed using -DZEROMQ
 #       - ZEROMQ_INCLUDE_DIR - Where to find zeromq include sub-directory.
 #       - ZEROMQ_LIBRARIES   - List of libraries when using zeromq.
-#       - ZEROMQ_LIBRARIES_STATIC   - List of static libraries when using zeromq.
 #       - ZEROMQ_FOUND       - True if zeromq found.
 
 message(STATUS "Checking for ZeroMQ ${ZEROMQ}")
@@ -27,18 +26,12 @@ set(ZEROMQ_FOUND FALSE)
 if(ZEROMQ)
     # ZeroMQ is installed in a custom place
     find_library(ZEROMQ_LIBRARIES NAMES zmq
-                PATH ${ZEROMQ}/lib
+                PATHS ${ZEROMQ}/lib
                 NO_DEFAULT_PATH
                 DOC "Path to libzmq)"
             )
 
-    find_library(ZEROMQ_LIBRARIES_STATIC NAMES libzmq.a
-                PATH ${ZEROMQ}/lib
-                NO_DEFAULT_PATH
-                DOC "Path to libzmq)"
-            )
-            
-    find_path(ZEROMQ_INCLUDE_DIR NAMES zmq.hh zmq_utils.h}
+    find_path(ZEROMQ_INCLUDE_DIR NAMES zmq.h zmq_utils.h zmq.hpp}
                 PATHS ${ZEROMQ}/include
                 NO_DEFAULT_PATH
                 DOC "Path to ZeroMQ include header files."
@@ -49,10 +42,6 @@ else(ZEROMQ)
                 DOC "Path to libzmq)"
             )
 
-    find_library(ZEROMQ_LIBRARIES_STATIC NAMES libzmq.a
-                DOC "Path to libzmq)"
-            )
-
     find_path(ZEROMQ_INCLUDE_DIR NAMES zmq.hpp zmq_utils.h}
                 DOC "Path to ZeroMQ include header files."
             )
@@ -65,17 +54,12 @@ if(NOT ZEROMQ_LIBRARIES)
     set(ZEROMQ_DISABLED TRUE)
 endif()
 
-if(NOT ZEROMQ_LIBRARIES_STATIC AND NOT ZEROMQ_DISABLED)
-    message(STATUS "ZeroMQ static library not found. Disabling ZeroMQ support")
-    set(ZEROMQ_DISABLED TRUE)
-endif()
-
 if(NOT ZEROMQ_INCLUDE_DIR AND NOT ZEROMQ_DISABLED)
-    message(STATUS "ZeroMQ headers not found. Please install development package. Disabling ZeroMQ support")
+    message(STATUS "ZeroMQ headers not found. Please install development package + cppzmq interface. Disabling ZeroMQ support")
     set(ZEROMQ_DISABLED TRUE)
 endif()
 
-if(ZEROMQ_LIBRARIES AND ZEROMQ_LIBRARIES_STATIC AND ZEROMQ_INCLUDE_DIR)
+if(ZEROMQ_LIBRARIES AND ZEROMQ_INCLUDE_DIR)
     message(STATUS "Found ZeroMQ ${ZEROMQ_LIBRARIES}")
     set(ZEROMQ_FOUND TRUE)
 endif()