certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: certi-cvs
Subject: [certi-cvs] applications/HLA_TestsSuite HLATestsSuiteTools....
Date: Wed, 02 Jun 2010 08:32:08 +0000

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Eric NOULARD <erk>      10/06/02 08:32:08

Modified files:
        HLA_TestsSuite : HLATestsSuiteTools.cmake 

Log message:
        Authorize script-only tests.
        fix bug #26884 : Authorize script-only tests

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

Patches:
Index: HLATestsSuiteTools.cmake
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/HLATestsSuiteTools.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- HLATestsSuiteTools.cmake    19 May 2010 17:59:46 -0000      1.9
+++ HLATestsSuiteTools.cmake    2 Jun 2010 08:32:08 -0000       1.10
@@ -48,6 +48,7 @@
 MACRO(HLATestsSuite_ADD_TEST)
     PARSE_ARGUMENTS(HLATSTools 
"FED_FILE;SOURCE_FILES;DTEST_SCRIPT;COMMENTS;MORELIBS" "VERBOSE" ${ARGN})       
   
     CAR(TESTNAME ${HLATSTools_DEFAULT_ARGS})       
+           
     MESSAGE(STATUS "Configuring HLA Test: ${TESTNAME}")
     IF (HLATSTools_VERBOSE)     
        MESSAGE(STATUS "       FED_FILE = ${HLATSTools_FED_FILE}")
@@ -56,12 +57,17 @@
        MESSAGE(STATUS "       COMMENTS = ${HLATSTools_COMMENTS}")
        MESSAGE(STATUS "       MORELIBS = ${HLATSTools_MORELIBS}")
     ENDIF(HLATSTools_VERBOSE)
+    
+    IF (HLATSTools_SOURCE_FILES) 
     ADD_EXECUTABLE(${TESTNAME} ${HLATSTools_SOURCE_FILES})    
     TARGET_LINK_LIBRARIES (${TESTNAME} ${RTI_LIBRARIES} 
${HLATSTools_MORELIBS})    
-    INSTALL(TARGETS ${TESTNAME} 
-            RUNTIME DESTINATION bin)
-    INSTALL(FILES ${HLATSTools_FED_FILE}
-            DESTINATION share/federations)
+        INSTALL(TARGETS ${TESTNAME} RUNTIME DESTINATION bin)
+    ENDIF(HLATSTools_SOURCE_FILES)
+    
+    IF (HLATSTools_FED_FILE)
+        INSTALL(FILES ${HLATSTools_FED_FILE} DESTINATION share/federations)
+    ENDIF(HLATSTools_FED_FILE)
+    
     IF(HLATSTools_DTEST_SCRIPT)
         SET(NUM 0)
         foreach(DTEST_SCRIPT ${HLATSTools_DTEST_SCRIPT})
@@ -73,11 +79,13 @@
             ADD_TEST(${TESTNAME}-${NUM} ${DTEST_SCRIPT} 
--federate=${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME})
         endforeach(DTEST_SCRIPT)  
     ENDIF(HLATSTools_DTEST_SCRIPT)
+    
 ENDMACRO(HLATestsSuite_ADD_TEST)
 
 MACRO(HLATestsSuite_ADD_TEST1516)
     PARSE_ARGUMENTS(HLATSTools 
"FED_FILE;SOURCE_FILES;DTEST_SCRIPT;COMMENTS;MORELIBS" "VERBOSE" ${ARGN})       
   
     CAR(TESTNAME ${HLATSTools_DEFAULT_ARGS})       
+           
     MESSAGE(STATUS "Configuring HLA Test: ${TESTNAME}")
     IF (HLATSTools_VERBOSE)     
        MESSAGE(STATUS "       FED_FILE = ${HLATSTools_FED_FILE}")
@@ -86,12 +94,17 @@
        MESSAGE(STATUS "       COMMENTS = ${HLATSTools_COMMENTS}")
        MESSAGE(STATUS "       MORELIBS = ${HLATSTools_MORELIBS}")
     ENDIF(HLATSTools_VERBOSE)
+    
+    IF (HLATSTools_SOURCE_FILES)
     ADD_EXECUTABLE(${TESTNAME} ${HLATSTools_SOURCE_FILES})    
     TARGET_LINK_LIBRARIES (${TESTNAME} ${RTI1516_LIBRARIES} 
${HLATSTools_MORELIBS})    
-    INSTALL(TARGETS ${TESTNAME} 
-            RUNTIME DESTINATION bin)
-    INSTALL(FILES ${HLATSTools_FED_FILE}
-            DESTINATION share/federations)
+        INSTALL(TARGETS ${TESTNAME} RUNTIME DESTINATION bin)
+    ENDIF(HLATSTools_SOURCE_FILES)
+    
+    IF (HLATSTools_FED_FILE)
+        INSTALL(FILES ${HLATSTools_FED_FILE} DESTINATION share/federations)
+    ENDIF (HLATSTools_FED_FILE)
+    
     IF(HLATSTools_DTEST_SCRIPT)
         SET(NUM 0)
         foreach(DTEST_SCRIPT ${HLATSTools_DTEST_SCRIPT})
@@ -103,4 +116,5 @@
             ADD_TEST(${TESTNAME}-${NUM} ${DTEST_SCRIPT} 
--federate=${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME})
         endforeach(DTEST_SCRIPT)  
     ENDIF(HLATSTools_DTEST_SCRIPT)
+    
 ENDMACRO(HLATestsSuite_ADD_TEST1516)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]