[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi/libRTI CMakeLists.txt
From: |
CERTI CVS commits |
Subject: |
[certi-cvs] certi/libRTI CMakeLists.txt |
Date: |
Fri, 16 Sep 2011 16:39:04 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 11/09/16 16:39:04
Modified files:
libRTI : CMakeLists.txt
Log message:
Merge updated version of patch #7566
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/CMakeLists.txt?cvsroot=certi&r1=1.22&r2=1.23
Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/CMakeLists.txt,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- CMakeLists.txt 14 Sep 2011 20:32:57 -0000 1.22
+++ CMakeLists.txt 16 Sep 2011 16:39:04 -0000 1.23
@@ -59,7 +59,7 @@
#SOURCE_GROUP("RTI\\Header" FILES ${RTI_LIB_INCLUDE})
ADD_LIBRARY(RTI ${RTI_LIB_SRCS} ${RTI_LIB_INCLUDE})
-TARGET_LINK_LIBRARIES(RTI CERTI)
+TARGET_LINK_LIBRARIES(RTI CERTI FedTime)
IF (BUILD_LEGACY_LIBRTI)
MESSAGE(STATUS "libRTI variant: CERTI legacy")
@@ -123,7 +123,12 @@
${FEDTIME_SRCS}
)
-TARGET_LINK_LIBRARIES(FedTime RTI)
+# Correct line
+TARGET_LINK_LIBRARIES(FedTime)
+# Incorrect line
+# (at least the dependency exists but we cannot specify that
+# because we would generate a circular deps RTI-->FedTime-->RTI)
+#TARGET_LINK_LIBRARIES(FedTime RTI)
IF (WIN32 AND CERTI_RTING_DLL_USE_LIB_PREFIX)
SET_TARGET_PROPERTIES(FedTime PROPERTIES OUTPUT_NAME "libFedTime")
@@ -170,6 +175,8 @@
# Correct line
TARGET_LINK_LIBRARIES(FedTime1516)
# Incorrect line
+# (at least the dependency exists but we cannot specify that
+# because we would generate a circular deps RTI1516-->FedTime1516-->RTI1516)
#TARGET_LINK_LIBRARIES(FedTime1516 RTI1516)
SET_TARGET_PROPERTIES(FedTime1516 PROPERTIES PROJECT_LABEL LibFedTime1516)
- [certi-cvs] certi/libRTI CMakeLists.txt,
CERTI CVS commits <=