[certi-cvs] applications/HLA_TestsSuite MacroTools.cmake HL...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Eric NOULARD <erk>      08/05/10 16:06:47

Modified files:
        HLA_TestsSuite : MacroTools.cmake HLATestsSuiteTools.cmake 

Log message:
        Use CMake LIST builtin

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

Patches:
Index: MacroTools.cmake
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/MacroTools.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- MacroTools.cmake    8 May 2008 20:07:14 -0000       1.2
+++ MacroTools.cmake    10 May 2008 16:06:47 -0000      1.3
@@ -1,5 +1,5 @@
 # Those are CMake MACROs that one can find
-# on the CMake wiki ()
+# on the CMake wiki (http://www.cmake.org/Wiki)
 # The one-liner before each MACRO definition
 # gives the URL
 
@@ -57,41 +57,3 @@
   ENDIF(${LIST_FILTER_OUTPUT_VARIABLE} STREQUAL "LIST_FILTER_internal_output")
 ENDMACRO(LIST_FILTER)
 
-#http://www.cmake.org/Wiki/CMakeMacroParseArguments
-MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
-  SET(DEFAULT_ARGS)
-  FOREACH(arg_name ${arg_names})    
-    SET(${prefix}_${arg_name})
-  ENDFOREACH(arg_name)
-  FOREACH(option ${option_names})
-    SET(${prefix}_${option} FALSE)
-  ENDFOREACH(option)
-
-  SET(current_arg_name DEFAULT_ARGS)
-  SET(current_arg_list)
-  FOREACH(arg ${ARGN})            
-    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})
-      SET(current_arg_list)
-    ELSE (is_arg_name)
-      LIST_CONTAINS(is_option ${arg} ${option_names})
-      IF (is_option)
-            SET(${prefix}_${arg} TRUE)
-      ELSE (is_option)
-            SET(current_arg_list ${current_arg_list} ${arg})
-      ENDIF (is_option)
-    ENDIF (is_arg_name)
-  ENDFOREACH(arg)
-  SET(${prefix}_${current_arg_name} ${current_arg_list})
-ENDMACRO(PARSE_ARGUMENTS)
\ No newline at end of file

Index: HLATestsSuiteTools.cmake
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/HLATestsSuiteTools.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- HLATestsSuiteTools.cmake    7 May 2008 10:18:06 -0000       1.3
+++ HLATestsSuiteTools.cmake    10 May 2008 16:06:47 -0000      1.4
@@ -1,10 +1,43 @@
 
-INCLUDE(MacroTools.cmake)
+# Updated version of
+# http://www.cmake.org/Wiki/CMakeMacroParseArguments
+# which use builtin LIST(FIND ...) function
+MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
+  SET(DEFAULT_ARGS)
+  FOREACH(arg_name ${arg_names})    
+    SET(${prefix}_${arg_name})
+  ENDFOREACH(arg_name)
+  FOREACH(option ${option_names})
+    SET(${prefix}_${option} FALSE)
+  ENDFOREACH(option)
+
+  SET(current_arg_name DEFAULT_ARGS)
+  SET(current_arg_list)
+  FOREACH(arg ${ARGN})            
+    SET(larg_names ${arg_names})    
+    LIST(FIND larg_names "${arg}" is_arg_name)                   
+    IF (is_arg_name GREATER -1)
+      SET(${prefix}_${current_arg_name} ${current_arg_list})
+      SET(current_arg_name ${arg})
+      SET(current_arg_list)
+    ELSE (is_arg_name GREATER -1)
+      SET(loption_names ${option_names})    
+      LIST(FIND loption_names "${arg}" is_option)            
+      IF (is_option GREATER -1)
+            SET(${prefix}_${arg} TRUE)
+      ELSE (is_option GREATER -1)
+            SET(current_arg_list ${current_arg_list} ${arg})
+      ENDIF (is_option GREATER -1)
+    ENDIF (is_arg_name GREATER -1)
+  ENDFOREACH(arg)
+  SET(${prefix}_${current_arg_name} ${current_arg_list})
+ENDMACRO(PARSE_ARGUMENTS)
+
 ENABLE_TESTING()
 
 MACRO(HLATestsSuite_ADD_TEST)
     PARSE_ARGUMENTS(HLATSTools "FED_FILE;SOURCE_FILES;DTEST_SCRIPT;COMMENTS" 
"VERBOSE" ${ARGN})          
-    CAR(TESTNAME ${HLATSTools_DEFAULT_ARGS})       
+    LIST(GET HLATSTools_DEFAULT_ARGS 0 TESTNAME)
     MESSAGE(STATUS "Configuring HLA Test: ${TESTNAME}")
     IF (HLATSTools_VERBOSE)     
        MESSAGE(STATUS "       FED_FILE = ${HLATSTools_FED_FILE}")