HPCC-8733 cmake STREQUAL should be protected from empty strings

IF (${XYZ} STREQUAL "XYZ") will cause cmake configuration error if XYZ is blank.

Fixes HPCC-8733

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>

CMakeLists.txt

@@ -169,11 +169,11 @@ elseif ( UNIX )
     message ( "-- Auto Detecting Packaging type")
     message ( "-- distro uses ${packageManagement}, revision is ${packageRevisionArch}" )
 
-    if ( ${packageManagement} STREQUAL "DEB" )
+    if ( "${packageManagement}" STREQUAL "DEB" )
         set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}${packageRevisionArch}")
-    elseif ( ${packageManagement} STREQUAL "RPM" )
+    elseif ( "${packageManagement}" STREQUAL "RPM" )
         set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}.${packageRevisionArch}")
-        else()
+    else()
         set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}_${version}-${stagever}${CPACK_SYSTEM_NAME}")
     endif ()
 endif ()

cmake_modules/FindBINUTILS.cmake

@@ -20,7 +20,7 @@
 #  BINUTILS_FOUND - system has the BinUtils library BINUTILS_INCLUDE_DIR - the BinUtils include directory BINUTILS_LIBRARIES - The libraries needed 
 #  to use BinUtils
 IF (NOT BINUTILS_FOUND)
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (${ARCH64BIT} EQUAL 1)
       SET (osdir "linux64_gcc4.1.1")
     ELSE()

cmake_modules/FindBOOST_REGEX.cmake

@@ -32,7 +32,7 @@ IF (NOT BOOST_REGEX_FOUND)
   ELSEIF(WIN32)
     SET (boost_regex_lib "libboost_regex-vc90-mt.lib") # note - this may not be the lib we need, but should be in same place as it...
   ENDIF()
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osdir "linux-x86_64-gcc4")

cmake_modules/FindCPPUNIT.cmake

@@ -29,7 +29,7 @@ IF (NOT CPPUNIT_FOUND)
     SET (cppunit_dll "cppunit")
   ENDIF()
 
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
   
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)

cmake_modules/FindDOCBOOK.cmake

@@ -27,7 +27,7 @@ if (NOT XSLTPROC_FOUND)
     SET (xsltproc_n "xsltproc")
   ENDIF()
 
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osdir "linux64_gcc4.1.1")

cmake_modules/FindFOP.cmake

@@ -27,7 +27,7 @@ if (NOT FOP_FOUND)
     SET (fop_n "fop")
   ENDIF()
 
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osdir "linux64_gcc4.1.1")

cmake_modules/FindICU.cmake

@@ -23,7 +23,7 @@
 #  ICU_LIBRARIES - The libraries needed to use ICU
 
 IF (NOT ICU_FOUND)
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osdir "linux64_gcc4.1.1")

cmake_modules/FindLIBXML2.cmake

@@ -29,7 +29,7 @@ if (NOT LIBXML2_FOUND)
     SET (libxml2_libs "xml2 libxml2")
   ENDIF()
 
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osdir "linux64_gcc4.1.1")

cmake_modules/FindLIBXSLT.cmake

@@ -31,7 +31,7 @@ if (NOT LIBXSLT_FOUND)
     SET (libexslt_libs "exslt libexslt")
   ENDIF()
 
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osdir "linux64_gcc4.1.1")

cmake_modules/FindMYSQL.cmake

@@ -28,7 +28,7 @@ IF (NOT MYSQL_FOUND)
   ELSE()
     SET (mysql_lib "mysqlclient")
   ENDIF()
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osdir "linux64_gcc4.1.1")

cmake_modules/FindOPENLDAP.cmake

@@ -33,7 +33,7 @@ IF (NOT OPENLDAP_FOUND)
     SET (ldap_inc "ldap.h")
   ENDIF()
 
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osincdir "openldap/linux64_gcc4.1.1/include")

cmake_modules/FindOPENSSL.cmake

@@ -30,7 +30,7 @@ IF (NOT OPENSSL_FOUND)
   ELSE()
     SET (ssl_lib "libssl.so")
   ENDIF()
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osdir "linux64_gcc4.1.1")

cmake_modules/FindXALAN.cmake

@@ -29,7 +29,7 @@ IF (NOT XALAN_FOUND)
     SET (xalan_libs "xalan-c")
   ENDIF()
 
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osdir "linux64_gcc4.1.1")

cmake_modules/FindXERCES.cmake

@@ -29,7 +29,7 @@ if (NOT XERCES_FOUND)
     SET (xerces_libs "xerces-c")
   ENDIF()
 
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osdir "linux64_gcc4.1.1")

cmake_modules/FindXSLTPROC.cmake

@@ -27,7 +27,7 @@ if (NOT XSLTPROC_FOUND)
     SET (xsltproc_n "xsltproc")
   ENDIF()
 
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osdir "linux64_gcc4.1.1")

cmake_modules/FindZLIB.cmake

@@ -29,7 +29,7 @@ IF (NOT ZLIB_FOUND)
     SET (zlib_lib "z")
   ENDIF()
 
-  IF (NOT ${EXTERNALS_DIRECTORY} STREQUAL "")
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
     IF (UNIX)
       IF (${ARCH64BIT} EQUAL 1)
         SET (osdir "linux64_gcc4.1.1")

docs/CMakeLists.txt

@@ -31,7 +31,7 @@ set (FO_XSL ${CMAKE_CURRENT_BINARY_DIR}/BuildTools/fo.xsl)
 set (VERSION_DIR ${CMAKE_CURRENT_BINARY_DIR}/)
 
 
-if ( ${HPCC_MATURITY} STREQUAL "release" )
+if ( "${HPCC_MATURITY}" STREQUAL "release" )
 	set (DOC_VERSION "${DOC_VERSION}.${HPCC_SEQUENCE}")
 else()
 	set (DOC_VERSION "${DOC_VERSION}.${HPCC_SEQUENCE}${HPCC_MATURITY}")

initfiles/componentfiles/configxml/CMakeLists.txt

@@ -23,7 +23,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ftslave_linux.xsd.in ${CMAKE_CURRENT_
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/roxie.xsd.in ${CMAKE_CURRENT_BINARY_DIR}/roxie.xsd)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/thor.xsd.in ${CMAKE_CURRENT_BINARY_DIR}/thor.xsd)
 
-if ( ${HPCC_PROJECT} STREQUAL "community" )
+if ( "${HPCC_PROJECT}" STREQUAL "community" )
     configure_file("buildsetCC.xml.in" "buildset.xml")
 endif()