[certi-cvs] certi CMakeLists.txt libRTI/CMakeLists.txt libR...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Petr Gotthard <gotthardp>       09/08/31 13:25:45

Modified files:
        .              : CMakeLists.txt 
        libRTI         : CMakeLists.txt RTIambassador.cc 

Log message:
        bug #27343: Implemented HLA13-NG behaviour for parameter less tick()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/CMakeLists.txt?cvsroot=certi&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.104&r2=3.105

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- CMakeLists.txt      30 Apr 2009 09:25:10 -0000      1.68
+++ CMakeLists.txt      31 Aug 2009 13:25:44 -0000      1.69
@@ -47,6 +47,9 @@
     SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 ENDIF(USE_FULL_RPATH)
   
+OPTION(BUILD_LEGACY_LIBRTI
+             "Build CERTI legacy libRTI" OFF)
+
 OPTION(BUILD_DOC
              "Build documentation (using doxygen)" OFF)         
              

Index: libRTI/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libRTI/CMakeLists.txt       2 Apr 2009 19:58:06 -0000       1.11
+++ libRTI/CMakeLists.txt       31 Aug 2009 13:25:45 -0000      1.12
@@ -25,7 +25,15 @@
 ADD_LIBRARY(RTI ${RTI_LIB_SRCS} ${RTI_LIB_INCLUDE})
 TARGET_LINK_LIBRARIES(RTI CERTI FedTime)
 
-SET_TARGET_PROPERTIES(RTI PROPERTIES OUTPUT_NAME "RTI-NG")
+IF (BUILD_LEGACY_LIBRTI)
+    MESSAGE(STATUS "libRTI variant: CERTI legacy")
+    SET_TARGET_PROPERTIES(RTI PROPERTIES OUTPUT_NAME "RTI")
+    SET_TARGET_PROPERTIES(RTI PROPERTIES COMPILE_FLAGS "-DLEGACY_LIBRTI")
+ELSE (BUILD_LEGACY_LIBRTI)
+    MESSAGE(STATUS "libRTI variant: HLA 1.3 NG")
+    SET_TARGET_PROPERTIES(RTI PROPERTIES OUTPUT_NAME "RTI-NG")
+    SET_TARGET_PROPERTIES(RTI PROPERTIES COMPILE_FLAGS "-DHLA13NG_LIBRTI")
+ENDIF (BUILD_LEGACY_LIBRTI)
 SET_TARGET_PROPERTIES(RTI PROPERTIES VERSION 1.0.0 SOVERSION 1)
 IF (MINGW)
     SET_TARGET_PROPERTIES(RTI PROPERTIES LINK_FLAGS 
"-Wl,--output-def,${LIBRARY_OUTPUT_PATH}/libRTI.def")

Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.104
retrieving revision 3.105
diff -u -b -r3.104 -r3.105
--- libRTI/RTIambassador.cc     12 Jun 2009 08:59:28 -0000      3.104
+++ libRTI/RTIambassador.cc     31 Aug 2009 13:25:45 -0000      3.105
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RTIambassador.cc,v 3.104 2009/06/12 08:59:28 gotthardp Exp $
+// $Id: RTIambassador.cc,v 3.105 2009/08/31 13:25:45 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #include "RTI.hh"
@@ -237,7 +237,14 @@
            RTI::ConcurrentAccessAttempted,
            RTI::RTIinternalError)
 {
+#if defined(LEGACY_LIBRTI)
    __tick_kernel(RTI_FALSE, 0.0, 0.0);
+#elif defined (HLA13NG_LIBRTI)
+    // may suffer from starving
+    __tick_kernel(RTI_TRUE, 0.0, std::numeric_limits<double>::infinity());
+#else
+#error "At least one LIBRTI flag must be defined."
+#endif
    return RTI_FALSE;
 }
 
@@ -2948,4 +2955,4 @@
     privateRefs->executeService(&req, &rep);
 }
 
-// $Id: RTIambassador.cc,v 3.104 2009/06/12 08:59:28 gotthardp Exp $
+// $Id: RTIambassador.cc,v 3.105 2009/08/31 13:25:45 gotthardp Exp $