From e1642cf37c58544e75614a315553cda0b9c8c2db Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@gmail.com>
Date: Tue, 19 Apr 2022 20:11:31 +0200
Subject: [PATCH] bugfix cmake zeromq

---
 cmake/SlsFindZeroMQ.cmake                |  2 +-
 cmake/libzmq-pkg-config/FindZeroMQ.cmake | 36 +++++++++++++++---------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/cmake/SlsFindZeroMQ.cmake b/cmake/SlsFindZeroMQ.cmake
index 74b4ce1bb..45874dcff 100644
--- a/cmake/SlsFindZeroMQ.cmake
+++ b/cmake/SlsFindZeroMQ.cmake
@@ -6,7 +6,7 @@ function(custom_find_zmq)
             message(STATUS "Looking for ZeroMQ in: ${ZeroMQ_HINT}")
             find_package(ZeroMQ 4 
                 NO_DEFAULT_PATH
-                HINTS ${ZeroMQ_DIR}
+                HINTS ${ZeroMQ_HINT}
             )
         else()
             find_package(ZeroMQ 4 QUIET)
diff --git a/cmake/libzmq-pkg-config/FindZeroMQ.cmake b/cmake/libzmq-pkg-config/FindZeroMQ.cmake
index 76fb69dd0..976a1cd4c 100755
--- a/cmake/libzmq-pkg-config/FindZeroMQ.cmake
+++ b/cmake/libzmq-pkg-config/FindZeroMQ.cmake
@@ -4,25 +4,33 @@ find_package(PkgConfig)
 pkg_check_modules(PC_LIBZMQ QUIET libzmq)
 
 set(ZeroMQ_VERSION ${PC_LIBZMQ_VERSION})
-find_library(ZeroMQ_LIBRARY NAMES libzmq.so libzmq.dylib libzmq.dll
-             PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS})
-find_library(ZeroMQ_STATIC_LIBRARY NAMES libzmq-static.a libzmq.a libzmq.dll.a
-             PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS})
+
+find_path(ZeroMQ_INCLUDE_DIR zmq.h
+        PATHS ${ZeroMQ_DIR}/include
+        ${PC_LIBZMQ_INCLUDE_DIRS}
+)
+
+find_library(ZeroMQ_LIBRARY
+        NAMES zmq
+        PATHS ${ZeroMQ_DIR}/lib
+        ${PC_LIBZMQ_LIBDIR}
+        ${PC_LIBZMQ_LIBRARY_DIRS}
+)
 
 if(ZeroMQ_LIBRARY OR ZeroMQ_STATIC_LIBRARY)
     set(ZeroMQ_FOUND ON)
     message(STATUS "Found libzmq using PkgConfig")
 endif()
 
-if (TARGET libzmq)
-    # avoid errors defining targets twice
-    return()
+set ( ZeroMQ_LIBRARIES ${ZeroMQ_LIBRARY} )
+set ( ZeroMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR} )
+
+if (NOT TARGET libzmq)
+    add_library(libzmq UNKNOWN IMPORTED)
+    set_target_properties(libzmq PROPERTIES
+            IMPORTED_LOCATION ${ZeroMQ_LIBRARIES}
+            INTERFACE_INCLUDE_DIRECTORIES ${ZeroMQ_INCLUDE_DIRS})
 endif()
 
-add_library(libzmq SHARED IMPORTED)
-set_property(TARGET libzmq PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PC_LIBZMQ_INCLUDE_DIRS})
-set_property(TARGET libzmq PROPERTY IMPORTED_LOCATION ${ZeroMQ_LIBRARY})
-
-add_library(libzmq-static STATIC IMPORTED ${PC_LIBZMQ_INCLUDE_DIRS})
-set_property(TARGET libzmq-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PC_LIBZMQ_INCLUDE_DIRS})
-set_property(TARGET libzmq-static PROPERTY IMPORTED_LOCATION ${ZeroMQ_STATIC_LIBRARY})
\ No newline at end of file
+include ( FindPackageHandleStandardArgs )
+find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS )
\ No newline at end of file