Automatic snapshot commit from tribits at 29607f6

Origin repo remote tracking branch: 'github/master' Origin repo remote repo URL: 'github = [email protected]:TriBITSPub/TriBITS.git' At commit: commit 29607f6b5b95fd9ab298135de86855e75bf74343 Author: Roscoe A. Bartlett <[email protected]> Date: Tue Jun 27 09:18:00 2017 -0600 Summary: Change name of var 'result' to 'eti_result' to avoid clash (#199)
trilinos · Jun 27, 2017 · 55074a3 · 55074a3
1 parent e669c24
commit 55074a3
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/cmake/tribits/core/package_arch/TribitsETISupport.cmake b/cmake/tribits/core/package_arch/TribitsETISupport.cmake
@@ -57,6 +57,7 @@ FUNCTION(TRIBITS_ETI_TYPE_EXPANSION outvar first_list)
     SET(label "${CMAKE_MATCH_1}")
     SET(tlist "${CMAKE_MATCH_2}")
   ENDIF()
+  SET(eti_result "") 
   SPLIT("${tlist}" "\\|" tlist)
   IF ("${${outvar}}" STREQUAL "")
     SET(accumulate OFF)
@@ -70,39 +71,39 @@ FUNCTION(TRIBITS_ETI_TYPE_EXPANSION outvar first_list)
       STRING(STRIP "${t}" t)
       SET(t "{${t}}")
       FOREACH(s ${sub})
-        LIST(APPEND result "${label}=${t} ${s}")
+        LIST(APPEND eti_result "${label}=${t} ${s}")
       ENDFOREACH()
     ENDFOREACH()
   ELSE()
     FOREACH(t ${tlist})
       STRING(STRIP "${t}" t)
       SET(t "{${t}}")
-      LIST(APPEND result "${label}=${t}")
+      LIST(APPEND eti_result "${label}=${t}")
     ENDFOREACH()
   ENDIF()
   IF (accumulate)
-    SET(${outvar} "${${outvar}};${result}" PARENT_SCOPE)
+    SET(${outvar} "${${outvar}};${eti_result}" PARENT_SCOPE)
   ELSE()
-    SET(${outvar} "${result}"              PARENT_SCOPE)
+    SET(${outvar} "${eti_result}"              PARENT_SCOPE)
   ENDIF()
 ENDFUNCTION()
 
 # Explode an ETI set into a variable number of named component fields
 FUNCTION(TRIBITS_ETI_EXPLODE fields inst outvar)
   foreach (field ${fields})
     IF(    "${inst}" MATCHES "( |^)${field}={([^{}$=]*)}( |$)")
-      LIST(APPEND result "${CMAKE_MATCH_2}")
+      LIST(APPEND eti_result "${CMAKE_MATCH_2}")
     ELSEIF("${inst}" MATCHES "( |^)${field}=([^{} $=]*)( |$)")
-      LIST(APPEND result "${CMAKE_MATCH_2}")
+      LIST(APPEND eti_result "${CMAKE_MATCH_2}")
     ELSEIF(NOT "${inst}" MATCHES "( |^)${field}=")
-      LIST(APPEND result "TYPE-MISSING")
+      LIST(APPEND eti_result "TYPE-MISSING")
     ELSE()
-      SET(result "TRIBITS_ETI_BAD_PARSE")
+      SET(eti_result "TRIBITS_ETI_BAD_PARSE")
       BREAK()
     ENDIF()
   endforeach()
-  JOIN(result "|" FALSE ${result})
-  SET(${outvar} "${result}" PARENT_SCOPE)
+  JOIN(eti_result "|" FALSE ${eti_result})
+  SET(${outvar} "${eti_result}" PARENT_SCOPE)
 ENDFUNCTION()
 
 # effectively, a tupled regex, wrapped in a for loop