      )
      INSTALL(DIRECTORY ${VISIT_MPICH_DIR}/bin
          DESTINATION ${VISIT_INSTALLED_VERSION}
-@@ -2052,7 +2055,7 @@
+@@ -2052,7 +2058,7 @@
          DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
                                GROUP_READ GROUP_WRITE GROUP_EXECUTE
                                WORLD_READ             WORLD_EXECUTE

         FILES_MATCHING PATTERN "*.h"
         PATTERN "*.hpp"
         PATTERN ".svn" EXCLUDE
@@ -1400,6 +1400,8 @@
     # if there truly are current definitions, and more than 1 in the list, then
     # IF(${currentDefs} MATCHES NOTFOUND) causes a configure failure.
     # Grab the first item in the list for comparison instead.
+    LIST(LENGTH currentDefs listlen)
+    if (${listlen} GREATER 0)
     LIST(GET currentDefs 0 firstItem )
     IF(${firstItem} MATCHES NOTFOUND)
         SET(allDefs ${newDefs})
@@ -1409,6 +1411,7 @@
     SET_TARGET_PROPERTIES(${target} PROPERTIES
             COMPILE_DEFINITIONS "${allDefs}"
         )
+    endif ()
 ENDFUNCTION(ADD_TARGET_DEFINITIONS)
 
 FUNCTION(ADD_PARALLEL_EXECUTABLE target)
@@ -2042,7 +2045,7 @@
         DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
                               GROUP_READ GROUP_WRITE GROUP_EXECUTE
                               WORLD_READ             WORLD_EXECUTE

     )
     INSTALL(DIRECTORY ${VISIT_MPICH_DIR}/lib
         DESTINATION ${VISIT_INSTALLED_VERSION}
@@ -2062,7 +2068,7 @@
         DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
                               GROUP_READ GROUP_WRITE GROUP_EXECUTE
                               WORLD_READ             WORLD_EXECUTE
