[certi-cvs] applications/HLA_TestsSuite CMakeLists.txt HLAT...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Eric NOULARD <erk>      08/11/06 22:11:41

Modified files:
        HLA_TestsSuite : CMakeLists.txt HLATestsSuiteTools.cmake 

Log message:
        Use FindRTI instead of FindCERTI.cmake

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/CMakeLists.txt?cvsroot=certi&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/HLATestsSuiteTools.cmake?cvsroot=certi&r1=1.5&r2=1.6

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/CMakeLists.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- CMakeLists.txt      21 Oct 2008 13:42:27 -0000      1.25
+++ CMakeLists.txt      6 Nov 2008 22:11:40 -0000       1.26
@@ -10,6 +10,8 @@
 # any RTI.
 #########################################################################
 PROJECT(HLA_TestsSuite CXX)
+# enabling C is needed if you want to compile C files.
+ENABLE_LANGUAGE(C)
 
 #########################################################################
 # Setup reasonable default CMake behavior
@@ -20,8 +22,6 @@
 INCLUDE(${CMAKE_ROOT}/Modules/Dart.cmake)
 MARK_AS_ADVANCED(TCL_TCLSH DART_ROOT)
 
-# Use CERTI specific CMake modules first
-
 # Use CERTI_HOME env var if it is defined
 IF ("$ENV{CERTI_HOME}" STRGREATER "")
     FILE(TO_CMAKE_PATH "$ENV{CERTI_HOME}" CERTI_HOME_TEMP)
@@ -70,9 +70,11 @@
 MESSAGE(STATUS "Configuring ${PACKAGE_NAME} version ${PACKAGE_VERSION}")
 
 #########################################################################
-# Call i.e. INCLUDE the CERTI usage configuration
+# FIND RTI (CERTI, MAK, Pitch, ...)
 #########################################################################
-INCLUDE(UseCERTI)
+FIND_PACKAGE(RTI REQUIRED)
+INCLUDE_DIRECTORIES(${RTI_INCLUDE_DIR})
+ADD_DEFINITIONS(${RTI_DEFINITIONS})
 
 #########################################################################
 # CPack specific Configuration
@@ -110,13 +112,7 @@
 SET(CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION_PATCH})
 
 INCLUDE(CPack)
-
-INCLUDE(HLATestsSuiteTools)
-IF(BUILD_TESTING)
-  SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Debian SID x86_64")
-  MARK_AS_ADVANCED(BUILDNAME)
-ENDIF(BUILD_TESTING)
-
+INCLUDE(${CMAKE_SOURCE_DIR}/HLATestsSuiteTools.cmake)
 
 #########################################################################
 # ADD TEST ELEMENTARY PROGRAM
@@ -188,6 +184,7 @@
                       FED_FILE TestFed.fed BuggyFed.fed Hierarchical.fed 
RPR-FOM.fed aviationsimnetV3.1.xml
                       SOURCE_FILES test_FOMParse.cc test_FOMParse_cmdline.h 
test_FOMParse_cmdline.c
                       DTEST_SCRIPT dtest_test_FOMParse.py 
-                      COMMENTS "A FOM parsing test")
+                      COMMENTS "A FOM parsing test"
+                      )
 
 MESSAGE(STATUS "*** ${CMAKE_PROJECT_NAME} has been successfully configured 
***")

Index: HLATestsSuiteTools.cmake
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/HLATestsSuiteTools.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- HLATestsSuiteTools.cmake    13 May 2008 12:20:41 -0000      1.5
+++ HLATestsSuiteTools.cmake    6 Nov 2008 22:11:41 -0000       1.6
@@ -117,7 +117,7 @@
        MESSAGE(STATUS "       COMMENTS = ${HLATSTools_COMMENTS}")
     ENDIF(HLATSTools_VERBOSE)
     ADD_EXECUTABLE(${TESTNAME} ${HLATSTools_SOURCE_FILES})    
-    TARGET_LINK_LIBRARIES (${TESTNAME} ${CERTI_LIBRARIES})    
+    TARGET_LINK_LIBRARIES (${TESTNAME} ${RTI_LIBRARIES})    
     INSTALL(TARGETS ${TESTNAME} 
             RUNTIME DESTINATION bin)
     INSTALL(FILES ${HLATSTools_FED_FILE}