[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libHLA/CMakeLists.txt libRTI/CMakeLists.txt
From: |
CERTI CVS commits |
Subject: |
[certi-cvs] certi libHLA/CMakeLists.txt libRTI/CMakeLists.txt |
Date: |
Wed, 25 Sep 2013 14:57:05 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 13/09/25 14:57:05
Modified files:
libHLA : CMakeLists.txt
libRTI : CMakeLists.txt
Log message:
Merge patch #8187 : Fix for CTest Nightly
This requires cmake 2.8.0.
The requirement has been added in a previous commit.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libHLA/CMakeLists.txt?cvsroot=certi&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/CMakeLists.txt?cvsroot=certi&r1=1.26&r2=1.27
Patches:
Index: libHLA/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libHLA/CMakeLists.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libHLA/CMakeLists.txt 26 Apr 2012 08:23:26 -0000 1.19
+++ libHLA/CMakeLists.txt 25 Sep 2013 14:57:05 -0000 1.20
@@ -46,8 +46,8 @@
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
-ADD_TEST(LibHLA_MB_Tests MessageBufferTests)
-ADD_TEST(LibHLA_MB_Tests_InC MsgBufferTests)
+ADD_TEST(NAME LibHLA_MB_Tests COMMAND $<TARGET_FILE:MessageBufferTests>)
+ADD_TEST(NAME LibHLA_MB_Tests_InC COMMAND $<TARGET_FILE:MsgBufferTests>)
SET(LIBHLA_CLOCK_SRCS
Clock.cc
@@ -126,11 +126,11 @@
ADD_EXECUTABLE(TestHLAtypes TestHLAtypes.cc)
TARGET_LINK_LIBRARIES(TestHLAtypes HLA)
-ADD_TEST(LibHLAtypes TestHLAtypes)
+ADD_TEST(NAME LibHLAtypes COMMAND $<TARGET_FILE:TestHLAtypes>)
ADD_EXECUTABLE(TestClocks TestClocks.cc)
TARGET_LINK_LIBRARIES(TestClocks HLA)
-ADD_TEST(LibHLAClocks TestClocks)
+ADD_TEST(NAME LibHLAClocks COMMAND $<TARGET_FILE:TestClocks>)
INSTALL(FILES
${LIBHLA_EXPORTED_INCLUDES}
Index: libRTI/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/CMakeLists.txt,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- libRTI/CMakeLists.txt 18 Dec 2011 16:02:23 -0000 1.26
+++ libRTI/CMakeLists.txt 25 Sep 2013 14:57:05 -0000 1.27
@@ -185,7 +185,7 @@
)
ADD_EXECUTABLE(TestFedTime ${TestFedTime_SRCS})
TARGET_LINK_LIBRARIES(TestFedTime FedTime RTI)
-ADD_TEST(TestLibFedTime TestFedTime)
+ADD_TEST(NAME TestLibFedTime COMMAND $<TARGET_FILE:TestFedTime>)
##########################################################
SET(FEDTIME1516_SRCS
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libHLA/CMakeLists.txt libRTI/CMakeLists.txt,
CERTI CVS commits <=