[certi-cvs] applications/HLA_TestsSuite MacroTools.cmake

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Eric NOULARD <erk>      08/05/08 20:07:14

Modified files:
        HLA_TestsSuite : MacroTools.cmake 

Log message:
        Use builtin LIST command when possible

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/MacroTools.cmake?cvsroot=certi&r1=1.1&r2=1.2

Patches:
Index: MacroTools.cmake
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/MacroTools.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MacroTools.cmake    3 May 2008 10:22:42 -0000       1.1
+++ MacroTools.cmake    8 May 2008 20:07:14 -0000       1.2
@@ -5,30 +5,6 @@
 
 # Here is following several macros from
 # http://www.cmake.org/Wiki/CMakeMacroListOperations
-MACRO(LIST_LENGTH var)
-  SET(entries)
-  FOREACH(e ${ARGN})
-    SET(entries "${entries}.")
-  ENDFOREACH(e)
-  STRING(LENGTH ${entries} ${var})
-ENDMACRO(LIST_LENGTH)
-
-MACRO(LIST_INDEX var index)
-  SET(list . ${ARGN})
-  FOREACH(i RANGE 1 ${index})
-    CDR(list ${list})
-  ENDFOREACH(i)
-  CAR(${var} ${list})
-ENDMACRO(LIST_INDEX)
-
-MACRO(CAR var)
-  SET(${var} ${ARGV1})
-ENDMACRO(CAR)
-
-MACRO(CDR var junk)
-  SET(${var} ${ARGN})
-ENDMACRO(CDR)
-
 MACRO(LIST_CONTAINS var value)
   SET(${var})
   FOREACH (value2 ${ARGN})
@@ -94,7 +70,16 @@
   SET(current_arg_name DEFAULT_ARGS)
   SET(current_arg_list)
   FOREACH(arg ${ARGN})    
-    LIST_CONTAINS(is_arg_name ${arg} ${arg_names})
+    SET(larg_names ${arg_names})    
+    LIST(FIND larg_names "${arg}" is_arg_name)
+    IF (is_arg_name GREATER -1)
+       set(is_arg_name TRUE)
+    ELSE (is_arg_name GREATER -1)
+       set(is_arg_name)
+    ENDIF (is_arg_name GREATER -1)
+    #MESSAGE("is_arg_name-LIST = ${is_arg_name}")
+    #LIST_CONTAINS(is_arg_name ${arg} ${arg_names})
+    #MESSAGE("is_arg_name-CONTAINS = ${is_arg_name}")            
     IF (is_arg_name)
       SET(${prefix}_${current_arg_name} ${current_arg_list})
       SET(current_arg_name ${arg})