[certi-cvs] applications/HLA_TestsSuite HLATestsSuiteTools....

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Eric NOULARD <erk>      08/11/20 15:29:34

Modified files:
        HLA_TestsSuite : HLATestsSuiteTools.cmake 

Log message:
        Remove duplicate MACRO def for now
        Use --federate argument with the DTest script 
        in order to use absolute file path for the federate binary.
        (in order to avoid bad version mismatch from the path)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/HLATestsSuiteTools.cmake?cvsroot=certi&r1=1.6&r2=1.7

Patches:
Index: HLATestsSuiteTools.cmake
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/HLATestsSuiteTools.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- HLATestsSuiteTools.cmake    6 Nov 2008 22:11:41 -0000       1.6
+++ HLATestsSuiteTools.cmake    20 Nov 2008 15:29:34 -0000      1.7
@@ -1,66 +1,5 @@
 ENABLE_TESTING()
 
-SET(NEW_CMAKE FALSE)
-
-IF(NEW_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)
-
-MACRO(HLATestsSuite_ADD_TEST)
-    PARSE_ARGUMENTS(HLATSTools "FED_FILE;SOURCE_FILES;DTEST_SCRIPT;COMMENTS" 
"VERBOSE" ${ARGN})             
-    LIST(GET HLATSTools_DEFAULT_ARGS 0 TESTNAME)
-    MESSAGE(STATUS "Configuring HLA Test: ${TESTNAME}")
-    IF (HLATSTools_VERBOSE)     
-       MESSAGE(STATUS "       FED_FILE = ${HLATSTools_FED_FILE}")
-       MESSAGE(STATUS "   SOURCE_FILES = ${HLATSTools_SOURCE_FILES}")
-       MESSAGE(STATUS "   DTEST_SCRIPT = ${HLATSTools_DTEST_SCRIPT}")
-       MESSAGE(STATUS "       COMMENTS = ${HLATSTools_COMMENTS}")
-    ENDIF(HLATSTools_VERBOSE)
-    ADD_EXECUTABLE(${TESTNAME} ${HLATSTools_SOURCE_FILES})    
-    TARGET_LINK_LIBRARIES (${TESTNAME} ${CERTI_LIBRARIES})    
-    INSTALL(TARGETS ${TESTNAME} 
-            RUNTIME DESTINATION bin)
-    INSTALL(FILES ${HLATSTools_FED_FILE}
-            DESTINATION share/federations)
-    IF(HLATSTools_DTEST_SCRIPT)
-        CONFIGURE_FILE(${HLATSTools_DTEST_SCRIPT} ${HLATSTools_DTEST_SCRIPT} 
COPYONLY)
-        ADD_TEST(${TESTNAME} ${HLATSTools_DTEST_SCRIPT}) 
-    ENDIF(HLATSTools_DTEST_SCRIPT)
-ENDMACRO(HLATestsSuite_ADD_TEST)
-
-ELSE(NEW_CMAKE)
-
 # Here is following several macros from
 # http://www.cmake.org/Wiki/CMakeMacroListOperations
 MACRO(CAR var)
@@ -124,8 +63,6 @@
             DESTINATION share/federations)
     IF(HLATSTools_DTEST_SCRIPT)
         CONFIGURE_FILE(${HLATSTools_DTEST_SCRIPT} ${HLATSTools_DTEST_SCRIPT} 
COPYONLY)
-        ADD_TEST(${TESTNAME} ${HLATSTools_DTEST_SCRIPT}) 
+        ADD_TEST(${TESTNAME} ${HLATSTools_DTEST_SCRIPT} 
--federate=${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}) 
     ENDIF(HLATSTools_DTEST_SCRIPT)
 ENDMACRO(HLATestsSuite_ADD_TEST)
-
-ENDIF(NEW_CMAKE)
\ No newline at end of file