Browse Source

HPCC-18089 Add directory exists guard for FILE() calls in find_package scripts

Signed-off-by: Michael Gardner <michael.gardner@lexisnexisrisk.com>
Michael Gardner 7 years ago
parent
commit
365b180489

+ 1 - 1
cmake_modules/FindEXAMPLE_PLUGIN_DEP.cmake

@@ -46,7 +46,7 @@ IF (NOT EXAMPLE_PLUGIN_DEP_FOUND)
   #"#define EXAMPLE_PLUGIN_DEP_PATCH 2"
   #The minimum version to requirement is made visible to this cmake file from
   #HPCC/plugins/exampleplugin/CMakeLists.txt:ADD_PLUGIN(EXAMPLEPLUGIN PACKAGES EXAMPLE_PLUGIN_DEP MINVERSION 4.6.2)
-  IF  (EXAMPLE_PLUGIN_DEP_INCLUDE_DIR)
+  IF  (EXISTS "${EXAMPLE_PLUGIN_DEP_INCLUDE_DIR}/hpcc-example-plugin-deps.h")
     #MAJOR
     FILE (STRINGS "${EXAMPLE_PLUGIN_DEP_INCLUDE_DIR}/hpcc-example-plugin-deps.h" major REGEX "#define EXAMPLE_PLUGIN_DEP_MAJOR")
     STRING (REGEX REPLACE "#define EXAMPLE_PLUGIN_DEP_MAJOR " "" major "${major}")

+ 1 - 1
cmake_modules/FindHIREDIS.cmake

@@ -31,7 +31,7 @@ IF (NOT HIREDIS_FOUND)
   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)
 
-  IF(HIREDIS_INCLUDE_DIR)
+  IF(EXISTS "${HIREDIS_INCLUDE_DIR}/hiredis/hiredis.h")
     #MAJOR
     FILE (STRINGS "${HIREDIS_INCLUDE_DIR}/hiredis/hiredis.h" major REGEX "#define HIREDIS_MAJOR")
     STRING(REGEX REPLACE "#define HIREDIS_MAJOR " "" major "${major}")

+ 1 - 1
cmake_modules/FindLIBMEMCACHED.cmake

@@ -47,7 +47,7 @@ if(NOT LIBMEMCACHED_FOUND)
 
     set(LIBMEMCACHED_LIBRARIES ${LIBMEMCACHEDCORE_LIBRARY} ${LIBMEMCACHEDUTIL_LIBRARY})
 
-    if(LIBMEMCACHED_INCLUDE_DIR)
+    if(EXISTS "${LIBMEMCACHED_INCLUDE_DIR}/libmemcached-1.0/configure.h")
         file(STRINGS "${LIBMEMCACHED_INCLUDE_DIR}/libmemcached-1.0/configure.h" version REGEX "#define LIBMEMCACHED_VERSION_STRING")
         string(REGEX REPLACE "#define LIBMEMCACHED_VERSION_STRING " "" version "${version}")
         string(REGEX REPLACE "\"" "" version "${version}")

+ 15 - 13
cmake_modules/FindR.cmake

@@ -44,19 +44,21 @@ IF (NOT R_FOUND)
     SET (RCPP_LIBRARY "")    # Newer versions of Rcpp are header-only, with no associated library.
   ENDIF()
 
-  #Rcpp/config.h
-  #define RCPP_VERSION Rcpp_Version(0,12,3)
-  FILE(STRINGS "${RCPP_INCLUDE_DIR}/Rcpp/config.h" version_string REGEX "#define RCPP_VERSION Rcpp_Version\\(")
-  #major
-  STRING(REGEX REPLACE "#define RCPP_VERSION Rcpp_Version\\(" "" major "${version_string}")
-  STRING(REGEX REPLACE ",[0-9]+,[0-9]+\\)" "" major "${major}")
-  #minor
-  STRING(REGEX REPLACE "#define RCPP_VERSION Rcpp_Version\\([0-9]+," "" minor "${version_string}")
-  STRING(REGEX REPLACE ",[0-9]+\\)" "" minor "${minor}")
-  #patch
-  STRING(REGEX REPLACE "#define RCPP_VERSION Rcpp_Version\\([0-9]+,[0-9]+," "" patch "${version_string}")
-  STRING(REGEX REPLACE "\\)" "" patch "${patch}")
-  SET(RCPP_VERSION_STRING "${major}.${minor}.${patch}")
+  IF(EXISTS "${RCPP_INCLUDE_DIR}/Rcpp/config.h")
+    #Rcpp/config.h
+    #define RCPP_VERSION Rcpp_Version(0,12,3)
+    FILE(STRINGS "${RCPP_INCLUDE_DIR}/Rcpp/config.h" version_string REGEX "#define RCPP_VERSION Rcpp_Version\\(")
+    #major
+    STRING(REGEX REPLACE "#define RCPP_VERSION Rcpp_Version\\(" "" major "${version_string}")
+    STRING(REGEX REPLACE ",[0-9]+,[0-9]+\\)" "" major "${major}")
+    #minor
+    STRING(REGEX REPLACE "#define RCPP_VERSION Rcpp_Version\\([0-9]+," "" minor "${version_string}")
+    STRING(REGEX REPLACE ",[0-9]+\\)" "" minor "${minor}")
+    #patch
+    STRING(REGEX REPLACE "#define RCPP_VERSION Rcpp_Version\\([0-9]+,[0-9]+," "" patch "${version_string}")
+    STRING(REGEX REPLACE "\\)" "" patch "${patch}")
+    SET(RCPP_VERSION_STRING "${major}.${minor}.${patch}")
+  ENDIF()
 
   SET (R_INCLUDE_DIRS ${R_INCLUDE_DIR} ${RINSIDE_INCLUDE_DIR} ${RCPP_INCLUDE_DIR})
   SET (R_LIBRARIES ${R_LIBRARY} ${RINSIDE_LIBRARY} ${RCPP_LIBRARY})