[openrtm-commit:01698] r2701 - in branches/RELENG_1_1/OpenRTM-aist: . build win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2016年 2月 1日 (月) 16:54:44 JST
Author: kawauchi
Date: 2016-02-01 16:54:44 +0900 (Mon, 01 Feb 2016)
New Revision: 2701
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/rtm_config.vsprops
Log:
[merge] r2700 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-2574,2592,2605,2610,2626,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697
+ /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-2574,2592,2605,2610,2626,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700
Modified: branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py 2016-01-29 04:20:07 UTC (rev 2700)
+++ branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py 2016-02-01 07:54:44 UTC (rev 2701)
@@ -71,68 +71,12 @@
set(OPENRTM_VERSION_PATCH [openrtm_version_patch])
set(OPENRTM_SHORT_VERSION [openrtm_short_version])
-# CMAKE_GENERATOR check
-if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008")
- set(RTM_VC_VER "vc9")
- set(CMAKE_BITNESS "32")
-endif()
-if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 2010")
- set(RTM_VC_VER "vc10")
- set(CMAKE_BITNESS "32")
-endif()
-if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 2010 Win64")
- set(RTM_VC_VER "vc10")
- set(CMAKE_BITNESS "64")
-endif()
-if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012")
- set(RTM_VC_VER "vc11")
- set(CMAKE_BITNESS "32")
-endif()
-if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012 Win64")
- set(RTM_VC_VER "vc11")
- set(CMAKE_BITNESS "64")
-endif()
-if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013")
- set(RTM_VC_VER "vc12")
- set(CMAKE_BITNESS "32")
-endif()
-if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013 Win64")
- set(RTM_VC_VER "vc12")
- set(CMAKE_BITNESS "64")
-endif()
-if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015")
- set(RTM_VC_VER "vc14")
- set(CMAKE_BITNESS "32")
-endif()
-if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 Win64")
- set(RTM_VC_VER "vc14")
- set(CMAKE_BITNESS "64")
-endif()
-
-MESSAGE(STATUS "VC version is : ${CMAKE_GENERATOR} (${CMAKE_BITNESS}bit)")
-
-if ("${CMAKE_BITNESS}" STREQUAL "32")
- set(OPENRTM_DIR "$ENV{ProgramFiles}/OpenRTM-aist/${OPENRTM_VERSION}_${RTM_VC_VER}")
-else()
- set(OPENRTM_DIR "$ENV{ProgramW6432}/OpenRTM-aist/${OPENRTM_VERSION}_${RTM_VC_VER}")
-endif()
-
-string(REGEX REPLACE "/$" "" OPENRTM_DIR "${OPENRTM_DIR}")
-
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 options
-file(GLOB _vers RELATIVE "${OMNIORB_DIR}" "${OMNIORB_DIR}/THIS_IS_OMNIORB*")
-if("${_vers}" STREQUAL "")
- message(FATAL_ERROR "omniORB version file not found.")
-endif()
-string(REGEX REPLACE "[[]^0-9]+([[]0-9]+)_([[]0-9]+)_([[]0-9]+)"
- "\\\\1.\\\\2.\\\\3" OMNIORB_VERSION "${_vers}")
-
-set(OMNIORB_DIR ${OPENRTM_DIR}/omniORB/${OMNIORB_VERSION}_${RTM_VC_VER})
-set(OMNIORB_SHORT_VERSION [omni_dllver])
-
set(OMNIORB_CFLAGS [omniorb_cflags])
set(OMNIORB_INCLUDE_DIRS [omniorb_include_dirs])
set(OMNIORB_LDFLAGS [omniorb_ldflags])
@@ -143,12 +87,19 @@
set(OPENRTM_CFLAGS [openrtm_cflags])
set(OPENRTM_INCLUDE_DIRS [openrtm_include_dirs])
set(OPENRTM_LDFLAGS [openrtm_ldflags])
+
+get_filename_component(OpenRTM_CONFIG2_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE)
+set(OPENRTM_BIN_PATH "${OPENRTM_DIR}/bin")
+file(GLOB rtm_libs "${OpenRTM_CONFIG2_PATH}/RTC*.lib")
+foreach(rtm_lib ${rtm_libs})
+ if(EXISTS "${rtm_lib}")
+ set(OPENRTM_BIN_PATH ${OpenRTM_CONFIG2_PATH})
+ endif()
+endforeach()
+message(STATUS "OPENRTM_BIN_PATH=${OPENRTM_BIN_PATH}")
+
set(OPENRTM_LIBRARY_DIRS [openrtm_lib_dirs])
-if ("${CMAKE_BITNESS}" STREQUAL "32")
- set(OPENRTM_LIBRARIES [openrtm_libs])
-else()
- set(OPENRTM_LIBRARIES [openrtm_libs_x64])
-endif()
+set(OPENRTM_LIBRARIES [openrtm_libs])
# OpenRTM-aist specific directory
set(COIL_INCLUDE_DIR [coil_include_dir])
@@ -160,9 +111,6 @@
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}")
@@ -189,8 +137,6 @@
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
"""
@@ -274,12 +220,9 @@
# libs
omni_libs = process_lib(dict["omni_lib"], "optimized")
omni_libs += ";" + process_lib(dict["omni_libd"], "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")
+ rtm_libs = process_lib(dict["rtm_lib"], "optimized")
+ rtm_libs += ";" + process_lib(dict["rtm_libd"], "debug")
-
dict["omniorb_cflags"] = omni_cflags
dict["omniorb_include_dirs"] = dict["omni_includes"]
dict["omniorb_ldflags"] = ""
@@ -289,9 +232,8 @@
dict["openrtm_cflags"] = rtm_cflags
dict["openrtm_include_dirs"] = str(dict["rtm_includes"])
dict["openrtm_ldflags"] = ""
- dict["openrtm_lib_dirs"] = str(dict["rtm_libdir"] + ";" + dict["omni_libdir"])
+ dict["openrtm_lib_dirs"] = str("${OPENRTM_BIN_PATH};" + dict["omni_libdir"])
dict["openrtm_libs"] = str(rtm_libs)
- dict["openrtm_libs_x64"] = str(rtm_libs_x64)
dict["coil_include_dir"] = str(dict["rtm_libdir"])
dict["openrtm_version"] = str(dict["rtm_version"])
dict["openrtm_version_major"] = str(dict["rtm_version"].split(".")[0])
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-29 04:20:07 UTC (rev 2700)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2016-02-01 07:54:44 UTC (rev 2701)
@@ -34,14 +34,6 @@
Value="%RTM_DLLVER%"
/>
<UserMacro
- 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%"
/>
@@ -53,14 +45,6 @@
Name="coil_dllver"
Value="%COIL_DLLVER%"
/>
- <UserMacro
- 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"
@@ -117,23 +101,6 @@
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"
/>
More information about the openrtm-commit
mailing list