EVPATH upstream

thirdparty/EVPath/EVPath/CMakeLists.txt

@@ -376,7 +376,11 @@ if (MSVC)
     set(EVPATH_USE_ZPL_ENET FALSE)
 endif()
 if(NOT (DEFINED EVPATH_USE_ZPL_ENET))
+<<<<<<< HEAD
   option(EVPATH_USE_ZPL_ENET "Build the enet transport" "OFF")
+=======
+  option(EVPATH_USE_ZPL_ENET "Build the zplenet transport" "OFF")
+>>>>>>> upstream-EVPath
 endif()
 if(EVPATH_USE_ZPL_ENET)
   set(RUN_ZPL_ENET_TESTS TRUE)
@@ -447,7 +451,7 @@ else()
   option(EVPATH_USE_LIBFABRIC "Build the libfabric transport"
     ${LIBFABRIC_FOUND})
 endif()
-if(LIBFABRIC_FOUND) 
+if(LIBFABRIC_FOUND AND NOT EVPATH_NO_RDMA) 
   if(EVPATH_TRANSPORT_MODULES)
     add_library(cmfabric MODULE cmfabric.c ip_config.c)
     set_target_properties(cmfabric PROPERTIES
@@ -485,7 +489,7 @@ else()
   option(EVPATH_USE_IBVERBS "Build the libfabric transport" ${IBVERBS_FOUND})
 endif()
 set(HAVE_IBVERBS ${IBVERBS_FOUND})
-if(IBVERBS_FOUND)
+if(IBVERBS_FOUND AND NOT EVPATH_NO_RDMA)
   if(BUILD_TESTING)
     if(NOT CMAKE_CROSSCOMPILING)
       message(STATUS "Check MEMLOCK rlimit for IB tests")
@@ -548,7 +552,7 @@ if(IBVERBS_FOUND)
     find_package(NNTI)
     option(EVPATH_USE_NNTI "Build the nnti transport" ${NNTI_FOUND})
   endif()
-  if(NNTI_FOUND)
+  if(NNTI_FOUND AND NOT EVPATH_NO_RDMA)
     if(CercsArch STREQUAL "ppc64")
       set(RUN_NNTI_TESTS FALSE)
     endif()
@@ -571,7 +575,7 @@ if(IBVERBS_FOUND)
     endif()
   endif()
 else()
-  set(EVPATH_USE_NNTI FALSE "Build the nnti transport" FORCE)
+  set(EVPATH_USE_NNTI FALSE CACHE INTERNAL "Build the nnti transport" FORCE)
 endif()
 
 # Install extra find module dependencies