[openrtm-commit:02918] r3073 - in trunk/OpenRTM-aist: . src/lib/coil/tests/UUID src/lib/rtm/tests/CORBA_IORUtil src/lib/rtm/tests/ConnectorListener src/lib/rtm/tests/CorbaNaming src/lib/rtm/tests/CorbaPort src/lib/rtm/tests/DataInOutPort src/lib/rtm/tests/ECFactory src/lib/rtm/tests/ExtTrigExecutionContext src/lib/rtm/tests/Factory src/lib/rtm/tests/Manager src/lib/rtm/tests/ManagerServant src/lib/rtm/tests/ModuleManager src/lib/rtm/tests/NamingManager src/lib/rtm/tests/PeriodicECSharedComposite src/lib/rtm/tests/PeriodicExecutionContext src/lib/rtm/tests/PortAdmin src/lib/rtm/tests/PortBase src/lib/rtm/tests/RTObject src/lib/rtm/tests/SdoConfiguration src/lib/rtm/tests/SdoOrganization src/lib/rtm/tests/SystemLogger
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 11月 16日 (木) 10:40:49 JST
Author: kawauchi
Date: 2017-11-16 10:40:49 +0900 (Thu, 16 Nov 2017)
New Revision: 3073
Modified:
trunk/OpenRTM-aist/configure.ac
trunk/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/CORBA_IORUtil/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/ConnectorListener/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/CorbaNaming/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/CorbaPort/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/DataInOutPort/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/ECFactory/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/ExtTrigExecutionContext/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/Factory/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/NamingManager/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/PeriodicECSharedComposite/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/PeriodicExecutionContext/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/PortAdmin/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/PortBase/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/SdoConfiguration/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/SdoOrganization/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/SystemLogger/Makefile.am
Log:
[incompat,bugfix,->RELENG_1_2] '-lrt' option has been added. refs #3269
Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/configure.ac 2017-11-16 01:40:49 UTC (rev 3073)
@@ -156,7 +156,7 @@
[Linux*)]
AC_DEFINE([RTM_OS_LINUX], [TRUE], [OS is Linux])
AC_DEFINE([_REENTRANT], [TRUE], [Multi Thread Support])
- LDFLAGS="-luuid -ldl -export-dynamic $LDFLAGS"
+ LDFLAGS="-luuid -lrt -ldl -export-dynamic $LDFLAGS"
os="linux"
;;
[HP-UX*)]
@@ -190,7 +190,7 @@
os="cygwin"
CPPFLAGS="-DCygwin $CPPFLAGS"
CXXFLAGS="-DCygwin $CXXFLAGS"
- LDFLAGS="-no-undefined -luuid -ldl -export-dynamic $LDFLAGS"
+ LDFLAGS="-no-undefined -luuid -lrt -ldl -export-dynamic $LDFLAGS"
;;
*)
echo "Unkonown system"
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -32,7 +32,7 @@
UUIDTests_SOURCES = $(UUIDTests_COMMON_SOURCES) \
$(top_srcdir)/posix/coil/UUID.cpp
UUIDTests_LDFLAGS = -L$(libdir)
-UUIDTests_LDADD = -lcppunit -luuid
+UUIDTests_LDADD = -lcppunit -luuid -lrt
TEST_SRC = $(UUIDTests_COMMON_SOURCES) \
$(top_srcdir)/win32/coil/UUID.cpp
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/CORBA_IORUtil/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/CORBA_IORUtil/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/CORBA_IORUtil/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -62,7 +62,7 @@
CORBA_IORUtilTests.cpp
CORBA_IORUtilTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-CORBA_IORUtilTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+CORBA_IORUtilTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
# Extra sources included distribution
EXTRA_DIST = \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ConnectorListener/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ConnectorListener/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ConnectorListener/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -63,7 +63,7 @@
ConnectorListenerTests.cpp
ConnectorListenerTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-ConnectorListenerTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+ConnectorListenerTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
# Extra sources included distribution
EXTRA_DIST = \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/CorbaNaming/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/CorbaNaming/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/CorbaNaming/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -113,7 +113,7 @@
CorbaNamingTests.cpp
CorbaNamingTests_LDFLAGS = -L$(libdir) -L$(top_builddir)/src/lib/coil/lib
-CorbaNamingTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+CorbaNamingTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
CorbaNamingTests.cpp
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/CorbaPort/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/CorbaPort/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/CorbaPort/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -123,7 +123,7 @@
CorbaPortTests.cpp
CorbaPortTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-CorbaPortTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+CorbaPortTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
$(IDL_SOURCES) \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/DataInOutPort/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/DataInOutPort/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/DataInOutPort/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -119,7 +119,7 @@
DataInOutPortTests.cpp
DataInOutPortTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-DataInOutPortTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+DataInOutPortTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
# Extra sources included distribution
EXTRA_DIST = \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ECFactory/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ECFactory/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ECFactory/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -92,7 +92,7 @@
#ECFactoryTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
ECFactoryTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-ECFactoryTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+ECFactoryTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
ECFactoryTests.cpp
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ExtTrigExecutionContext/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ExtTrigExecutionContext/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ExtTrigExecutionContext/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -112,7 +112,7 @@
ExtTrigExecutionContextTests.cpp
ExtTrigExecutionContextTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-ExtTrigExecutionContextTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+ExtTrigExecutionContextTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
ExtTrigExecutionContextTests.cpp
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/Factory/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/Factory/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/Factory/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -106,7 +106,7 @@
FactoryTests.cpp
FactoryTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-FactoryTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+FactoryTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
FactoryTests.cpp
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -104,7 +104,8 @@
-lomnithread \
-lomniDynamic4 \
-lcoil \
- -luuid
+ -luuid \
+ -lrt
#
#
@@ -122,8 +123,9 @@
-lomniORB4 \
-lomnithread \
-lomniDynamic4 \
- -lcoil \
+ -lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/Manager/DummyLib.la
@@ -148,6 +150,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/Manager/DummyLib.la
nodist_DummyModule2_la_SOURCES = DummyModule2.h \
@@ -161,6 +164,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/Manager/DummyLib.la
bin_PROGRAMS = rtcprof
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -115,7 +115,8 @@
-lomnithread \
-lomniDynamic4 \
-lcoil \
- -luuid
+ -luuid \
+ -lrt
noinst_PROGRAMS = ManagerServantTests
@@ -133,6 +134,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/ManagerServant/DummyLib.la
TEST_SRC = $(ManagerServantTests_SOURCES)
@@ -156,6 +158,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/ManagerServant/DummyLib.la
nodist_DummyModule2_la_SOURCES = DummyModule2.h \
@@ -169,6 +172,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/ManagerServant/DummyLib.la
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -108,7 +108,8 @@
-lomnithread \
-lomniDynamic4 \
-lcoil \
- -luuid
+ -luuid \
+ -lrt
noinst_PROGRAMS = ModuleManagerTests
@@ -127,6 +128,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/ModuleManager/DummyLib.la
TEST_SRC = $(ModuleManagerTests_SOURCES)
@@ -148,6 +150,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/ModuleManager/DummyLib.la
bin_PROGRAMS = rtcprof
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/NamingManager/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/NamingManager/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/NamingManager/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -105,7 +105,7 @@
NamingManagerTests.cpp
NamingManagerTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-NamingManagerTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+NamingManagerTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
NamingManagerTests.cpp
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/PeriodicECSharedComposite/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/PeriodicECSharedComposite/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/PeriodicECSharedComposite/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -39,7 +39,7 @@
PeriodicECSharedCompositeTests.cpp
PeriodicECSharedCompositeTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-PeriodicECSharedCompositeTests_LDADD = -lcppunit -lRTC -lcoil -luuid -lgcov
+PeriodicECSharedCompositeTests_LDADD = -lcppunit -lRTC -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
PeriodicECSharedCompositeTests.cpp
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/PeriodicExecutionContext/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/PeriodicExecutionContext/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/PeriodicExecutionContext/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -95,7 +95,7 @@
PeriodicExecutionContextTests.cpp
PeriodicExecutionContextTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-PeriodicExecutionContextTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+PeriodicExecutionContextTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
PeriodicExecutionContextTests.cpp
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/PortAdmin/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/PortAdmin/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/PortAdmin/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -104,7 +104,7 @@
PortAdminTests.cpp
PortAdminTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-PortAdminTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+PortAdminTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
PortAdminTests.cpp
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/PortBase/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/PortBase/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/PortBase/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -123,7 +123,7 @@
PortBaseTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-PortBaseTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+PortBaseTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
PortBaseTests.cpp
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -119,7 +119,7 @@
RTObjectTests.cpp
RTObjectTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-RTObjectTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+RTObjectTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
RTObjectTests.cpp \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/SdoConfiguration/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/SdoConfiguration/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/SdoConfiguration/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -94,7 +94,7 @@
SdoConfigurationTests.cpp
SdoConfigurationTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-SdoConfigurationTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+SdoConfigurationTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
SdoConfigurationTests.cpp
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/SdoOrganization/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/SdoOrganization/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/SdoOrganization/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -43,7 +43,7 @@
# (top_builddir)/src/lib/rtm/SdoOrganization.cpp
SdoOrganizationTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-SdoOrganizationTests_LDADD = -lcppunit -lRTC -lcoil -luuid -lgcov
+SdoOrganizationTests_LDADD = -lcppunit -lRTC -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
SdoOrganizationTests.cpp
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/SystemLogger/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/SystemLogger/Makefile.am 2017-11-14 05:47:41 UTC (rev 3072)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/SystemLogger/Makefile.am 2017-11-16 01:40:49 UTC (rev 3073)
@@ -110,8 +110,9 @@
-lcppunit \
-lomniORB4 \
-lomnithread \
- -lcoil \
- -luuid
+ -lcoil \
+ -luuid \
+ -lrt
More information about the openrtm-commit
mailing list