[openrtm-commit:01679] r2695 - in branches/RELENG_1_1/OpenRTM-aist: . build win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2016年 1月 14日 (木) 11:59:40 JST
Author: kawauchi
Date: 2016-01-14 11:59:40 +0900 (Thu, 14 Jan 2016)
New Revision: 2695
Modified:
branches/RELENG_1_1/OpenRTM-aist/
branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
[merge] r2691-2692 have been merged from trunk.
Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
- /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592,2605,2610,2626,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2690
+ /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592,2605,2610,2626,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692
Modified: branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py 2016-01-14 02:57:20 UTC (rev 2694)
+++ branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py 2016-01-14 02:59:40 UTC (rev 2695)
@@ -112,13 +112,9 @@
MESSAGE(STATUS "VC version is : ${CMAKE_GENERATOR} (${CMAKE_BITNESS}bit)")
if ("${CMAKE_BITNESS}" STREQUAL "32")
- if ($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "x86")
- set(OPENRTM_DIR "C:/Program Files/OpenRTM-aist/${OPENRTM_VERSION}_${RTM_VC_VER}")
- else()
- set(OPENRTM_DIR "C:/Program Files (x86)/OpenRTM-aist/${OPENRTM_VERSION}_${RTM_VC_VER}")
- endif()
+ set(OPENRTM_DIR "$ENV{ProgramFiles}/OpenRTM-aist/${OPENRTM_VERSION}_${RTM_VC_VER}")
else()
- set(OPENRTM_DIR "C:/Program Files/OpenRTM-aist/${OPENRTM_VERSION}_${RTM_VC_VER}")
+ set(OPENRTM_DIR "$ENV{ProgramW6432}/OpenRTM-aist/${OPENRTM_VERSION}_${RTM_VC_VER}")
endif()
string(REGEX REPLACE "/$" "" OPENRTM_DIR "${OPENRTM_DIR}")
@@ -164,6 +160,9 @@
set(OPENRTM_IDLC [openrtm_idlc])
set(OPENRTM_IDLFLAGS [openrtm_idlflags])
+# OpenCV setting
+set(ENV{OpenCV_DIR} "${OPENRTM_DIR}")
+
message(STATUS "OpenRTM-aist configuration done")
message(STATUS " OMNIORB_DIR=${OMNIORB_DIR}")
@@ -190,6 +189,8 @@
message(STATUS " OPENRTM_IDL_WRAPPER=${OPENRTM_IDL_WRAPPER}")
message(STATUS " OPENRTM_IDL_WRAPPER_FLAGS=${OPENRTM_IDL_WRAPPER_FLAGS}")
+message(STATUS " OpenCV_DIR=$ENV{OpenCV_DIR}")
+
# end of OpenRTMConfig.cmake
"""
@@ -233,9 +234,11 @@
"COIL_DLLVER",
"COIL_VERSION",
"COIL_SHORTVER",
+ "COIL_DLL_SHORTVER",
"RTM_DLLVER",
"RTM_VERSION",
"RTM_SHORTVER",
+ "RTM_DLL_SHORTVER",
"OMNI_DLLVER",
"OMNI_VERSION",
"OMNI_SHORTVER",
@@ -271,10 +274,10 @@
# libs
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")
- rtm_libs_x64 = process_lib(dict["rtm_lib_x64"], "optimized")
- rtm_libs_x64 += ";" + process_lib(dict["rtm_libd_x64"], "debug")
+ rtm_libs = process_lib(dict["rtm_cmake_lib"], "optimized")
+ rtm_libs += ";" + process_lib(dict["rtm_cmake_libd"], "debug")
+ rtm_libs_x64 = process_lib(dict["rtm_cmake_lib_x64"], "optimized")
+ rtm_libs_x64 += ";" + process_lib(dict["rtm_cmake_libd_x64"], "debug")
dict["omniorb_cflags"] = omni_cflags
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2016-01-14 02:57:20 UTC (rev 2694)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2016-01-14 02:59:40 UTC (rev 2695)
@@ -61,12 +61,18 @@
@rem ------------------------------------------------------------
@rem Copying Config.cmake
@rem ------------------------------------------------------------
-set RTM_DLLVER=%RTM_VERSION:.=%
+if %ARCH% == x86 set DLL_ARCH=
+if %ARCH% == x86_64 set DLL_ARCH=_x64
+
+set RTM_VC_VER=vc%VC_VERSION%
+set RTM_DLLVER=%RTM_VERSION:.=%_%RTM_VC_VER%%DLL_ARCH%
set RTM_SHORTVER=%RTM_VERSION:~0,3%
+set RTM_DLL_SHORTVER=%RTM_VERSION:.=%
set COIL_VERSION=%RTM_VERSION%
set COIL_DLLVER=%RTM_DLLVER%
set COIL_SHORTVER=%RTM_SHORTVER%
+set COIL_DLL_SHORTVER=%RTM_DLL_SHORTVER%
set OMNI_DLLVER=%OMNI_VERSION:.=%
set OMNI_SHORTVER=%OMNI_VERSION:~0,3%
@@ -114,7 +120,7 @@
)
if %VC_VERSION% == 14 (
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
- set VCTOOLSET=12.0
+ set VCTOOLSET=14.0
set PLATFORMTOOL=/p:PlatformToolset=v140
goto MSBUILDx86
)
@@ -177,7 +183,7 @@
)
if /i %VC_VERSION% == 14 (
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
- set VCTOOLSET=12.0
+ set VCTOOLSET=14.0
set PLATFORMTOOL=/p:PlatformToolset=v140
goto MSBUILDx64
)
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2016-01-14 02:57:20 UTC (rev 2694)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2016-01-14 02:59:40 UTC (rev 2695)
@@ -31,13 +31,17 @@
/>
<UserMacro
Name="rtm_dllver"
- Value="%RTM_DLLVER%_${RTM_VC_VER}"
+ Value="%RTM_DLLVER%"
/>
<UserMacro
- Name="rtm_dllver_x64"
- Value="%RTM_DLLVER%_${RTM_VC_VER}_x64"
+ Name="rtm_cmake_dllver"
+ Value="%RTM_DLL_SHORTVER%_${RTM_VC_VER}"
/>
<UserMacro
+ Name="rtm_cmake_dllver_x64"
+ Value="%RTM_DLL_SHORTVER%_${RTM_VC_VER}_x64"
+ />
+ <UserMacro
Name="rtm_version"
Value="%RTM_VERSION%"
/>
@@ -47,12 +51,16 @@
/>
<UserMacro
Name="coil_dllver"
- Value="%COIL_DLLVER%_${RTM_VC_VER}"
+ Value="%COIL_DLLVER%"
/>
<UserMacro
- Name="coil_dllver_x64"
- Value="%COIL_DLLVER%_${RTM_VC_VER}_x64"
+ Name="coil_cmake_dllver"
+ Value="%COIL_DLL_SHORTVER%_${RTM_VC_VER}"
/>
+ <UserMacro
+ Name="coil_cmake_dllver_x64"
+ Value="%COIL_DLL_SHORTVER%_${RTM_VC_VER}_x64"
+ />
<!-- omniORB macros -->
<UserMacro
Name="omni_includes"
@@ -109,6 +117,23 @@
Value="RTC$(rtm_dllver_x64).lib $(coil_lib_x64) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
/>
<UserMacro
+ Name="rtm_cmake_libd"
+ Value="RTC$(rtm_cmake_dllver)d.lib coil$(coil_cmake_dllver)d.lib $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+ />
+ <UserMacro
+ Name="rtm_cmake_libd_x64"
+
+ Value="RTC$(rtm_cmake_dllver_x64)d.lib coil$(coil_cmake_dllver_x64)d.lib $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+ />
+ <UserMacro
+ Name="rtm_cmake_lib"
+ Value="RTC$(rtm_cmake_dllver).lib coil$(coil_cmake_dllver).lib $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+ />
+ <UserMacro
+ Name="rtm_cmake_lib_x64"
+ Value="RTC$(rtm_cmake_dllver_x64).lib coil$(coil_cmake_dllver_x64).lib $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+ />
+ <UserMacro
Name="rtm_idlc"
Value="omniidl"
/>
@@ -133,5 +158,4 @@
Name="coil_libd_x64"
Value="coil$(coil_dllver_x64)d.lib"
/>
-
</VisualStudioPropertySheet>
More information about the openrtm-commit
mailing list