HPCC-15012 Redis Plugin - correct cmake package names

Signed-off-by: James Noss <james.noss@lexisnexis.com>

cmake_modules/FindREDIS.cmake

@@ -14,29 +14,29 @@
 #    limitations under the License.
 ################################################################################
 
-# - Try to find the libhiredislibrary
+# - Try to find the hiredis library
 # Once done this will define
 #
-#  LIBHEDIS_FOUND - system has the libhiredis library
-#  LIBHIREDIS_INCLUDE_DIR - the libhiredis include directory(s)
-#  LIBHIREDIS_LIBRARY - The library needed to use hiredis
+#  HIREDIS_FOUND - system has the hiredis library
+#  HIREDIS_INCLUDE_DIR - the hiredis include directory(s)
+#  HIREDIS_LIBRARY - The library needed to use hiredis
 
-IF (NOT LIBREDIS_FOUND)
+IF (NOT HIREDIS_FOUND)
   IF (WIN32)
     SET (libhiredis "libhiredis")
   ELSE()
     SET (libhiredis "hiredis")
   ENDIF()
 
-  FIND_PATH(LIBHIREDIS_INCLUDE_DIR hiredis/hiredis.h PATHS /usr/include /usr/share/include /usr/local/include PATH_SUFFIXES hiredis)
-  FIND_LIBRARY(LIBHIREDIS_LIBRARY NAMES ${libhiredis} PATHS /usr/lib /usr/share /usr/lib64 /usr/local/lib /usr/local/lib64)
+  FIND_PATH(HIREDIS_INCLUDE_DIR hiredis/hiredis.h PATHS /usr/include /usr/share/include /usr/local/include PATH_SUFFIXES hiredis)
+  FIND_LIBRARY(HIREDIS_LIBRARY NAMES ${libhiredis} PATHS /usr/lib /usr/share /usr/lib64 /usr/local/lib /usr/local/lib64)
 
   include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(redis DEFAULT_MSG
-    LIBHIREDIS_LIBRARY
-    LIBHIREDIS_INCLUDE_DIR
+  find_package_handle_standard_args(hiredis DEFAULT_MSG
+    HIREDIS_LIBRARY
+    HIREDIS_INCLUDE_DIR
   )
 
-  MARK_AS_ADVANCED(LIBHIREDIS_INCLUDE_DIR LIBHIREDIS_LIBRARY)
+  MARK_AS_ADVANCED(HIREDIS_INCLUDE_DIR HIREDIS_LIBRARY)
 ENDIF()
 

plugins/redis/CMakeLists.txt

@@ -25,7 +25,7 @@
 project(redis)
 
 if(REDIS)
-    ADD_PLUGIN(redis PACKAGES REDIS OPTION MAKE_REDIS)
+    ADD_PLUGIN(redis PACKAGES HIREDIS OPTION MAKE_REDIS)
     if(MAKE_REDIS)
         set(
             SRCS
@@ -38,7 +38,7 @@ if(REDIS)
             ./../../rtl/include
             ./../../common/deftype
             ./../../system/jlib
-            ${LIBHIREDIS_INCLUDE_DIR})
+            ${HIREDIS_INCLUDE_DIR})
 
         add_definitions(-D_USRDLL -DECL_REDIS_EXPORTS)
 
@@ -57,7 +57,7 @@ if(REDIS)
             redis
             eclrtl
             jlib
-            ${LIBHIREDIS_LIBRARY})
+            ${HIREDIS_LIBRARY})
     endif()
 endif()