[openrtm-commit:02522] r2970 - in trunk/OpenRTM-aist: build win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-03-15 17:01:04 +0900 (Wed, 15 Mar 2017)
New Revision: 2970

Modified:
   trunk/OpenRTM-aist/build/cmakeconfgen.py
   trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
   trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
[compat,bugfix,->RELENG_1_2] Modified cmakeconfgen.py

Modified: trunk/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- trunk/OpenRTM-aist/build/cmakeconfgen.py	2017-03-15 07:06:46 UTC (rev 2969)
+++ trunk/OpenRTM-aist/build/cmakeconfgen.py	2017-03-15 08:01:04 UTC (rev 2970)
@@ -221,7 +221,9 @@
     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_ext_lib"], "optimized")
     rtm_libs  += ";" + process_lib(dict["rtm_libd"], "debug")
+    rtm_libs  += ";" + process_lib(dict["rtm_ext_libd"], "debug")
 
     dict["omniorb_cflags"] = omni_cflags
     dict["omniorb_include_dirs"] = dict["omni_includes"] 

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props	2017-03-15 07:06:46 UTC (rev 2969)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props	2017-03-15 08:01:04 UTC (rev 2970)
@@ -18,8 +18,10 @@
     <rtm_libdir>$(rtm_root)\bin</rtm_libdir>
     <rtm_bin>$(rtm_root)\bin;$(rtm_root)\build</rtm_bin>
     <rtm_path>$(rtm_bin);$(omni_bin)</rtm_path>
-    <rtm_libd>RTC$(rtm_dllver)d.lib;$(coil_libd);$(omni_libd);$(rtm_ext_libd);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_libd)</rtm_libd>
-    <rtm_lib>RTC$(rtm_dllver).lib;$(coil_lib);$(omni_lib);$(rtm_ext_lib);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_lib)</rtm_lib>
+    <rtm_libd>RTC$(rtm_dllver)d.lib;$(coil_libd);$(omni_libd);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_libd)</rtm_libd>
+    <rtm_lib>RTC$(rtm_dllver).lib;$(coil_lib);$(omni_lib);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_lib)</rtm_lib>
+    <rtm_ext_libd>$(rtm_ext_libd)</rtm_ext_libd>
+    <rtm_ext_lib>$(rtm_ext_lib)</rtm_ext_lib>
     <rtm_idlc>omniidl</rtm_idlc>
     <rtm_idlflags>-bcxx -Wba -nf -I $(SolutionDir)\rtm\idl</rtm_idlflags>
   </PropertyGroup>
@@ -94,6 +96,12 @@
     <BuildMacro Include="rtm_lib">
       <Value>$(rtm_lib)</Value>
     </BuildMacro>
+    <BuildMacro Include="rtm_ext_libd">
+      <Value>$(rtm_ext_libd)</Value>
+    </BuildMacro>
+    <BuildMacro Include="rtm_ext_lib">
+      <Value>$(rtm_ext_lib)</Value>
+    </BuildMacro>
     <BuildMacro Include="rtm_idlc">
       <Value>$(rtm_idlc)</Value>
     </BuildMacro>

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops	2017-03-15 07:06:46 UTC (rev 2969)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops	2017-03-15 08:01:04 UTC (rev 2970)
@@ -85,19 +85,19 @@
 	/>
 	<UserMacro
 		Name="rtm_libd"
-		Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) $(rtm_ext_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+		Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
 	/>
 	<UserMacro
 		Name="rtm_libd_x64"
-		Value="RTC$(rtm_dllver_x64)d.lib $(coil_libd_x64) $(omni_libd) $(rtm_ext_libd_x64) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+		Value="RTC$(rtm_dllver_x64)d.lib $(coil_libd_x64) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
 	/>
 	<UserMacro
 		Name="rtm_lib"
-		Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) $(rtm_ext_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+		Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
 	/>
 	<UserMacro
 		Name="rtm_lib_x64"
-		Value="RTC$(rtm_dllver_x64).lib $(coil_lib_x64) $(omni_lib) $(rtm_ext_lib_x64) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+		Value="RTC$(rtm_dllver_x64).lib $(coil_lib_x64) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
 	/>
 	<UserMacro
 		Name="rtm_idlc"