[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi include/RTI.hh include/fedtime.hh libCERT...
From: |
certi-cvs |
Subject: |
[certi-cvs] certi include/RTI.hh include/fedtime.hh libCERT... |
Date: |
Wed, 03 Dec 2008 10:23:54 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 08/12/03 10:23:54
Modified files:
include : RTI.hh fedtime.hh
libCERTI : CMakeLists.txt
Log message:
Update for cleanly independant libFedTime
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/include/RTI.hh?cvsroot=certi&r1=3.12&r2=3.13
http://cvs.savannah.gnu.org/viewcvs/certi/include/fedtime.hh?cvsroot=certi&r1=3.9&r2=3.10
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/CMakeLists.txt?cvsroot=certi&r1=1.20&r2=1.21
Patches:
Index: include/RTI.hh
===================================================================
RCS file: /sources/certi/certi/include/RTI.hh,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -b -r3.12 -r3.13
--- include/RTI.hh 30 Sep 2008 13:53:18 -0000 3.12
+++ include/RTI.hh 3 Dec 2008 10:23:53 -0000 3.13
@@ -1,5 +1,5 @@
// HLA 1.3 Header "RTI.hh"
-// $Id: RTI.hh,v 3.12 2008/09/30 13:53:18 erk Exp $
+// $Id: RTI.hh,v 3.13 2008/12/03 10:23:53 erk Exp $
#ifndef RTI_hh
#define RTI_hh
@@ -22,9 +22,15 @@
#else
#define CERTI_EXPORT __declspec(dllimport)
#endif
+ #if defined(FEDTIME_EXPORTS)
+ #define FEDTIME_EXPORT __declspec(dllexport)
+ #else
+ #define FEDTIME_EXPORT __declspec(dllimport)
+ #endif
#else
#define RTI_EXPORT
#define CERTI_EXPORT
+ #define FEDTIME_EXPORT
#endif
#ifdef RTI_USES_STD_FSTREAM
Index: include/fedtime.hh
===================================================================
RCS file: /sources/certi/certi/include/fedtime.hh,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -b -r3.9 -r3.10
--- include/fedtime.hh 6 May 2008 13:36:19 -0000 3.9
+++ include/fedtime.hh 3 Dec 2008 10:23:53 -0000 3.10
@@ -1,5 +1,5 @@
// HLA 1.3 Header "fedtime.hh"
-// $Id: fedtime.hh,v 3.9 2008/05/06 13:36:19 erk Exp $
+// $Id: fedtime.hh,v 3.10 2008/12/03 10:23:53 erk Exp $
#ifndef HLA_FEDTIME_HH
#define HLA_FEDTIME_HH
@@ -12,7 +12,7 @@
#endif
#include "RTI.hh"
-class CERTI_EXPORT RTIfedTime : public RTI::FedTime
+class FEDTIME_EXPORT RTIfedTime : public RTI::FedTime
{
public:
@@ -119,7 +119,7 @@
virtual RTIfedTime operator/(const RTI::Double &)
throw (RTI::InvalidFederationTime);
- friend RTI_STD::ostream CERTI_EXPORT &operator<<(RTI_STD::ostream&, const
RTI::FedTime &);
+ friend RTI_STD::ostream FEDTIME_EXPORT &operator<<(RTI_STD::ostream&,
const RTI::FedTime &);
private:
RTI::Double _fedTime ;
@@ -135,4 +135,4 @@
#endif // HLA_FEDTIME_HH
-// $Id: fedtime.hh,v 3.9 2008/05/06 13:36:19 erk Exp $
+// $Id: fedtime.hh,v 3.10 2008/12/03 10:23:53 erk Exp $
Index: libCERTI/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libCERTI/CMakeLists.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- libCERTI/CMakeLists.txt 25 Nov 2008 16:32:14 -0000 1.20
+++ libCERTI/CMakeLists.txt 3 Dec 2008 10:23:54 -0000 1.21
@@ -1,4 +1,10 @@
+##################################################################
+# Lib CERTI
+# The CERTI library is the internal CERTI library it should
+# not depends on _ANY_ RTI libs, neither libRTI nor libFedTime.
+# because it will end-up in an unwanted circular reference.
+##################################################################
SET(CERTI_FEDERATION_SRCS
fed.cc fed.hh
FederateLevelList.cc FederateLevelList.hh
@@ -63,10 +69,6 @@
LBTS.hh
)
-SET(CERTI_FEDTIME_SRCS
-FedTime.cc
-)
-
SET(CERTI_SUPPORT_SRCS
AuditFile.cc AuditFile.hh
AuditLine.cc AuditLine.hh
@@ -178,9 +180,6 @@
INCLUDE_DIRECTORIES("C:/Program Files/GnuWin32/include")
ENDIF (WIN32)
-SET(CERTI_EXPORTED_INCLUDES
- ../include/fedtime.hh)
-
ADD_LIBRARY(CERTI
${CERTI_FEDERATION_SRCS}
${CERTI_DECLARATION_SRCS}
@@ -191,7 +190,6 @@
${CERTI_SUPPORT_SRCS}
${CERTI_SOCKET_SRCS}
${CERTI_GENERATED_SRCS}
- ${CERTI_EXPORTED_INCLUDES}
)
SET_TARGET_PROPERTIES(CERTI PROPERTIES PROJECT_LABEL LibCERTI)
@@ -209,8 +207,22 @@
SET_TARGET_PROPERTIES(CERTI PROPERTIES VERSION 1.0.0 SOVERSION 1)
+##################################################################
+# Lib FedTime
+# A replacement lib FedTime may be provided by the user
+# CERTI is provided one. The lib FedTime depends on libRTI
+# since it inherits from the RTI::FedTime abstract class.
+##################################################################
+
+SET(FEDTIME_SRCS
+ FedTime.cc
+ ${CMAKE_SOURCE_DIR}/include/fedtime.hh
+)
+
+SOURCE_GROUP("Source Files\\FedTime" FILES ${FEDTIME_SRCS})
+
ADD_LIBRARY(FedTime
- ${CERTI_FEDTIME_SRCS}
+ ${FEDTIME_SRCS}
)
SET_TARGET_PROPERTIES(FedTime PROPERTIES PROJECT_LABEL LibFedTime)
@@ -223,6 +235,7 @@
SET_TARGET_PROPERTIES(FedTime PROPERTIES VERSION 1.0.0 SOVERSION 1)
+# Install rules for both libCERTI and libFedTime
INSTALL(TARGETS CERTI FedTime
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi include/RTI.hh include/fedtime.hh libCERT...,
certi-cvs <=