[openrtm-commit:02839] r3047 - in trunk/OpenRTM-aist: build win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-09-22 16:23:15 +0900 (Fri, 22 Sep 2017)
New Revision: 3047

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] When executing cmake, it is not influenced by the system environment variable. refs #4171

Modified: trunk/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- trunk/OpenRTM-aist/build/cmakeconfgen.py	2017-09-19 11:34:14 UTC (rev 3046)
+++ trunk/OpenRTM-aist/build/cmakeconfgen.py	2017-09-22 07:23:15 UTC (rev 3047)
@@ -71,11 +71,13 @@
 set(OPENRTM_VERSION_PATCH [openrtm_version_patch])
 set(OPENRTM_SHORT_VERSION [openrtm_short_version])
 
-string(REPLACE "\\\\" "/" OMNIORB_DIR "$ENV{OMNI_ROOT}")
 string(REPLACE "\\\\" "/" OPENRTM_DIR "$ENV{RTM_ROOT}")
-string(REGEX REPLACE "/$" "" OMNIORB_DIR "${OMNIORB_DIR}")
 string(REGEX REPLACE "/$" "" OPENRTM_DIR "${OPENRTM_DIR}")
 
+# omniORB version
+set(OMNIORB_VERSION [omniorb_version])
+set(OMNIORB_DIR "${OPENRTM_DIR}/omniORB/${OMNIORB_VERSION}_${RTM_VC_VER}")
+
 # omniORB options
 set(OMNIORB_CFLAGS [omniorb_cflags])
 set(OMNIORB_INCLUDE_DIRS [omniorb_include_dirs])
@@ -230,6 +232,7 @@
     dict["omniorb_ldflags"] = ""
     dict["omniorb_library_dirs"] = dict["omni_libdir"]
     dict["omniorb_libraries"] = omni_libs
+    dict["omniorb_version"] = str(dict["omni_version"])
 
     dict["openrtm_cflags"] = rtm_cflags
     dict["openrtm_include_dirs"] = str(dict["rtm_includes"])

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props	2017-09-19 11:34:14 UTC (rev 3046)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props	2017-09-22 07:23:15 UTC (rev 3047)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
+    <omni_version>$(OMNI_VERSION)</omni_version>
     <omni_dllver>$(OMNI_DLLVER)</omni_dllver>
     <omnithread_dllver>$(OMNITHREAD_DLLVER)</omnithread_dllver>
     <rtm_dllver>$(RTM_DLLVER)</rtm_dllver>
@@ -42,6 +43,9 @@
     <BuildMacro Include="omni_root">
       <Value>$(omni_root)</Value>
     </BuildMacro>
+    <BuildMacro Include="omni_version">
+      <Value>$(omni_version)</Value>
+    </BuildMacro>
     <BuildMacro Include="omni_dllver">
       <Value>$(omni_dllver)</Value>
     </BuildMacro>

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops	2017-09-19 11:34:14 UTC (rev 3046)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops	2017-09-22 07:23:15 UTC (rev 3047)
@@ -18,6 +18,10 @@
 		Value="%OMNI_ROOT%"
 	/>
 	<UserMacro
+		Name="omni_version"
+		Value="%OMNI_VERSION%"
+	/>
+	<UserMacro
 		Name="omni_dllver"
 		Value="%OMNI_DLLVER%"
 	/>