[openrtm-commit:03040] r3157 - in trunk/OpenRTM-aist: . src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-12-25 17:49:28 +0900 (Mon, 25 Dec 2017)
New Revision: 3157

Modified:
   trunk/OpenRTM-aist/CMakeLists.txt
   trunk/OpenRTM-aist/src/lib/rtm/SystemLogger.h
Log:
[incompat, VxWorks] refs #4381

Modified: trunk/OpenRTM-aist/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/CMakeLists.txt	2017-12-16 08:50:45 UTC (rev 3156)
+++ trunk/OpenRTM-aist/CMakeLists.txt	2017-12-25 08:49:28 UTC (rev 3157)
@@ -217,6 +217,15 @@
 endif()
 
 
+if(NO_LOGGING)
+	SET (ORB_C_FLAGS_LIST
+		${ORB_C_FLAGS_LIST}
+		-DNO_LOGGING
+	)
+	ADD_DEFINITIONS(-DNO_LOGGING)
+endif(NO_LOGGING)
+
+
 if(VXWORKS)
 
 	set(ORB_LIBRARIES_PATH)
@@ -258,6 +267,7 @@
 if(VXWORKS)
 	set(COIL_OS_DIR "vxworks")
 	set (RTM_OS_VXWORKS ON)
+	ADD_DEFINITIONS(-O2)
 elseif(UNIX)
 	set(COIL_OS_DIR "posix")
 	set (RTM_OS_LINUX ON)

Modified: trunk/OpenRTM-aist/src/lib/rtm/SystemLogger.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/SystemLogger.h	2017-12-16 08:50:45 UTC (rev 3156)
+++ trunk/OpenRTM-aist/src/lib/rtm/SystemLogger.h	2017-12-25 08:49:28 UTC (rev 3157)
@@ -613,6 +613,8 @@
 #define RTC_VERBOSE_STR(str)
 #define RTC_PARANOID(fmt)
 #define RTC_PARANOID_STR(str)
+#define RTC_FATAL(fmt)
+#define RTC_FATAL_STR(str)
 #endif
   
 }; // namespace RTC