[openrtm-commit:00214] r2198 - trunk/OpenRTM-aist/build

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2011-07-01 23:18:31 +0900 (Fri, 01 Jul 2011)
New Revision: 2198

Modified:
   trunk/OpenRTM-aist/build/cmakeconfgen.py
Log:
OpenRTMConfig.cmake's library list includes invalid "optimized" keyword.
Library handling function has been modified.


Modified: trunk/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- trunk/OpenRTM-aist/build/cmakeconfgen.py	2011-06-30 16:07:57 UTC (rev 2197)
+++ trunk/OpenRTM-aist/build/cmakeconfgen.py	2011-07-01 14:18:31 UTC (rev 2198)
@@ -143,14 +143,12 @@
 """
 
 
-def process_lib(libs):
+def process_lib(libs, type):
     liblist = libs.split(" ")
     results = ""
     for l in liblist:
-        if re.match(".*[dD].[lL][iI][bB]", l):
-            results += "debug;" + re.sub(".[lL][iI][bB]", "", l) + ";"
-        else:
-            results += "optimized;" + re.sub(".[lL][iI][bB]", "", l) + ";"
+        if re.match(".*.[lL][iI][bB]", l):
+            results += type + ";" + re.sub(".[lL][iI][bB]", "", l) + ";"
     return results[:-1]
 
 
@@ -202,10 +200,10 @@
         rtm_cflags += ";-D_WIN32_WINNT=0x0400"
 
     # libs
-    omni_libs  = process_lib(dict["omni_lib"])
-    omni_libs += ";" + process_lib(dict["omni_libd"])
-    rtm_libs   = process_lib(dict["rtm_lib"])
-    rtm_libs  += ";" + process_lib(dict["rtm_libd"])
+    omni_libs  = process_lib(dict["omni_lib"], "optimized")
+    omni_libs += ";" + process_lib(dict["omni_libd"], "debug")
+    rtm_libs   = process_lib(dict["rtm_lib"], "optimized")
+    rtm_libs  += ";" + process_lib(dict["rtm_libd"], "debug")