cmake sucks

Author: yeshengm

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 .idea/
 cmake-build-debug/
+build/
 debug/
 dxydocs/

CMakeLists.txt

@@ -913,10 +913,6 @@ if (WITH_RDMA)
     add_definitions(-DZMQ_HAVE_RDMA)
     list(APPEND cxx-sources rdma_address.hpp rdma_connecter.hpp rdma_engine.hpp rdma_listener.hpp
             rdma_address.cpp rdma_connecter.cpp rdma_engine.cpp rdma_listener.cpp)
-    if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-        target_link_libraries(libzmq ibverbs)
-        target_link_libraries(libzmq-static ibverbs)
-    endif()
 endif ()
 
 #-----------------------------------------------------------------------------
@@ -1171,7 +1167,13 @@ if (BUILD_SHARED)
     if (RT_LIBRARY)
         target_link_libraries(libzmq -lrt)
     endif ()
-endif ()
+
+    if (WITH_RDMA)
+        if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+                target_link_libraries(libzmq ibverbs)
+        endif()
+    endif ()
+endif()
 
 if (BUILD_STATIC)
 
@@ -1202,6 +1204,12 @@ if (BUILD_STATIC)
     if (RT_LIBRARY)
         target_link_libraries(libzmq-static -lrt)
     endif ()
+
+    if (WITH_RDMA)
+        if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+            target_link_libraries(libzmq-static ibverbs)
+        endif()
+    endif ()
 endif ()
 
 if (BUILD_SHARED)

src/address.cpp

@@ -36,6 +36,9 @@
 #include "udp_address.hpp"
 #include "ipc_address.hpp"
 #include "tipc_address.hpp"
+#ifdef ZMQ_HAVE_RDMA
+#include "rdma_address.hpp"
+#endif
 
 #if defined ZMQ_HAVE_VMCI
 #include "vmci_address.hpp"