[openrtm-commit:00165] r2176 - in branches/RELENG_1_1/OpenRTM-aist: . build etc packages/deb packages/rpm src/ext/sdo/logger src/ext/sdo/observer src/lib/rtm utils utils/cmake utils/rtm-config win32/OpenRTM-aist win32/OpenRTM-aist/cmake win32/OpenRTM-aist/etc win32/OpenRTM-aist/installer
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 6月 6日 (月) 09:32:16 JST
Author: n-ando
Date: 2011-06-06 09:32:16 +0900 (Mon, 06 Jun 2011)
New Revision: 2176
Added:
branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py
branches/RELENG_1_1/OpenRTM-aist/utils/cmake/
branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake
branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org
branches/RELENG_1_1/OpenRTM-aist/utils/cmake/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml
Removed:
branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake
branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org
branches/RELENG_1_1/OpenRTM-aist/utils/cmake/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml
Modified:
branches/RELENG_1_1/OpenRTM-aist/
branches/RELENG_1_1/OpenRTM-aist/build/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/build/codegen.py
branches/RELENG_1_1/OpenRTM-aist/build/makevcproj.py
branches/RELENG_1_1/OpenRTM-aist/build/makewrapper.pl
branches/RELENG_1_1/OpenRTM-aist/build/pickupprojs.py
branches/RELENG_1_1/OpenRTM-aist/build/setuptest.py
branches/RELENG_1_1/OpenRTM-aist/build/slntool.py
branches/RELENG_1_1/OpenRTM-aist/build/vcprojtool.py
branches/RELENG_1_1/OpenRTM-aist/build/vcxprojtool.py
branches/RELENG_1_1/OpenRTM-aist/configure.ac
branches/RELENG_1_1/OpenRTM-aist/etc/rtc.conf.sample
branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh
branches/RELENG_1_1/OpenRTM-aist/packages/deb/rules
branches/RELENG_1_1/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in
branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/logger/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.cpp
branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.h
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.h
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h
branches/RELENG_1_1/OpenRTM-aist/utils/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/openrtm-aist.pc.in
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/etc.yaml
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in
Log:
r2153:2175 merged
Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Added: svn:mergeinfo
+ /tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2175
Modified: branches/RELENG_1_1/OpenRTM-aist/build/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/Makefile.am 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/build/Makefile.am 2011-06-06 00:32:16 UTC (rev 2176)
@@ -17,6 +17,7 @@
slntool.py \
vcprojtool.py \
vsprops2cmake.py \
+ cmakeconfgen.py \
makewxs.py \
makewrapper.pl \
makewrapper.py \
Copied: branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py (from rev 2172, trunk/OpenRTM-aist/build/cmakeconfgen.py)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py 2011-06-06 00:32:16 UTC (rev 2176)
@@ -0,0 +1,241 @@
+#!/usr/bin/env python
+#
+# @brief CMake Config file generator
+# @date $Date$
+# @author Norkai Ando <n-ando at aist.go.jp>
+#
+# Copyright (C) 2011
+# Noriaki Ando
+# Intelligent Systems Research Institute,
+# National Institute of
+# Advanced Industrial Science and Technology (AIST), Japan
+# All rights reserved.
+#
+# $Id$
+#
+# Usage:
+# cmakeconfgen.py rtm_config.vsprops
+#
+# This command create OpenRTMConfig.cmake to the current directory
+#
+
+from xml.dom import minidom, Node
+import sys
+import re
+import os
+import yat
+import time
+
+template="""
+# -*- cmake -*-
+#
+# @file OpenRTMConfig.cmake
+# @brief cmake-config file for OpenRTM-aist on Windows
+# @date [date]
+#
+# This file is used for cmake config-mode.
+# The following variables are defined.
+#
+# Basic compiler/linker options
+# - OPENRTM_CFLAGS: cflags
+# - OPENRTM_INCLUDE_DIRS: include directories
+# - OPENRTM_LDFLAGS: linker options
+# - OPENRTM_LIBRARY_DIRS: library directories
+# - OPENRTM_LIBRARIES: libraries
+# - OPENRTM_LIB_DIR: OpenRTM's lib directory
+#
+# OpenRTM-aist specific directory
+# - COIL_INCLUDE_DIR: coil include dir
+# - OPENRTM_INCLUDE_DIR: OpenRTM's include directory
+# - OPENRTM_LIB_DIR: OpenRTM's lib directory
+# - OPENRTM_DATA_DIR: OpenRTM's shared directory
+#
+# OpenRTM-aist version
+# - OPENRTM_VERSION: x.y.z version
+# - OPENRTM_VERSION_MAJOR: major version number
+# - OPENRTM_VERSION_MINOR: minor version number
+# - OPENRTM_VERSION_PATCH: revision number
+# - OPENRTM_SHORT_VERSION: short version number 1.1.0->110
+#
+# OpenRTM-aist's CORBA related settings
+# - OPENRTM_ORB: CORBA implementation
+# - OPENRTM_IDL_WRAPPER: rtm-skelwrapper command
+# - OPENRTM_IDL_WRAPPER_FLAGS: rtm-skelwrapper flag
+# - OPENRTM_IDLC: IDL command
+# - OPENRTM_IDLFLAGS: IDL optins
+
+message(STATUS "OpenRTMConfig.cmake found.")
+message(STATUS "Configrued by configuration mode.")
+
+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_CFLAGS [omniorb_cflags])
+set(OMNIORB_INCLUDE_DIRS [omniorb_include_dirs])
+set(OMNIORB_LDFLAGS [omniorb_ldflags])
+set(OMNIORB_LIBRARY_DIRS [omniorb_library_dirs])
+set(OMNIORB_LIBRARIES [omniorb_libraries])
+
+# Basic compiler/linker options
+set(OPENRTM_CFLAGS [openrtm_cflags])
+set(OPENRTM_INCLUDE_DIRS [openrtm_include_dirs])
+set(OPENRTM_LDFLAGS [openrtm_ldflags])
+set(OPENRTM_LIBRARY_DIRS [openrtm_lib_dirs])
+set(OPENRTM_LIBRARIES [openrtm_libs])
+
+# OpenRTM-aist specific directory
+set(COIL_INCLUDE_DIR [coil_include_dir])
+set(OPENRTM_INCLUDE_DIR [openrtm_include_dir])
+set(OPENRTM_LIB_DIR [openrtm_libdir])
+set(OPENRTM_DATA_DIR [openrtm_data_dir])
+
+# OpenRTM-aist version
+set(OPENRTM_VERSION [openrtm_version])
+set(OPENRTM_VERSION_MAJOR [openrtm_version_major])
+set(OPENRTM_VERSION_MINOR [openrtm_version_minor])
+set(OPENRTM_VERSION_PATCH [openrtm_version_patch])
+set(OPENRTM_SHORT_VERSION [openrtm_short_version])
+
+# OpenRTM-aist's CORBA related settings
+set(OPENRTM_ORB [openrtm_orb])
+set(OPENRTM_IDL_WRAPPER [openrtm_idl_wrapper])
+set(OPENRTM_IDL_WRAPPER_FLAGS [openrtm_idl_wrapper_flags])
+set(OPENRTM_IDLC [openrtm_idlc])
+set(OPENRTM_IDLFLAGS [openrtm_idlflags])
+
+message(STATUS "OpenRTM-aist configuration done")
+
+message(STATUS " OMNIORB_DIR=${OMNIORB_DIR}")
+message(STATUS " OMNIORB_VERSION=${OMNIORB_VERSION}")
+message(STATUS " OMNIORB_CFLAGS=${OMNIORB_CFLAGS}")
+message(STATUS " OMNIORB_INCLUDE_DIRS=${OMNIORB_INCLUDE_DIRS}")
+message(STATUS " OMNIORB_LDFLAGS=${OMNIORB_LDFLAGS}")
+message(STATUS " OMNIORB_LIBRARY_DIRS=${OMNIORB_LIBRARY_DIRS}")
+message(STATUS " OMNIORB_LIBRARIES=${OMNIORB_LIBRARIES}")
+
+message(STATUS " OPENRTM_DIR=${OPENRTM_DIR}")
+message(STATUS " OPENRTM_VERSION=${OPENRTM_VERSION}")
+message(STATUS " OPENRTM_VERSION_MAJOR=${OPENRTM_VERSION_MAJOR}")
+message(STATUS " OPENRTM_VERSION_MINOR=${OPENRTM_VERSION_MINOR}")
+message(STATUS " OPENRTM_VERSION_PATCH=${OPENRTM_VERSION_PATCH}")
+message(STATUS " OPENRTM_CFLAGS=${OPENRTM_CFLAGS}")
+message(STATUS " OPENRTM_INCLUDE_DIRS=${OPENRTM_INCLUDE_DIRS}")
+message(STATUS " OPENRTM_LDFLAGS=${OPENRTM_LDFLAGS}")
+message(STATUS " OPENRTM_LIBRARY_DIRS=${OPENRTM_LIBRARY_DIRS}")
+message(STATUS " OPENRTM_LIBRARIES=${OPENRTM_LIBRARIES}")
+
+message(STATUS " OPENRTM_IDLC=${OPENRTM_IDLC}")
+message(STATUS " OPENRTM_IDLFLAGS=${OPENRTM_IDLFLAGS}")
+message(STATUS " OPENRTM_IDL_WRAPPER=${OPENRTM_IDL_WRAPPER}")
+message(STATUS " OPENRTM_IDL_WRAPPER_FLAGS=${OPENRTM_IDL_WRAPPER_FLAGS}")
+
+# end of OpenRTMConfig.cmake
+
+"""
+
+
+def process_lib(libs):
+ 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) + ";"
+ return results[:-1]
+
+
+if __name__ == '__main__':
+ if len(sys.argv) < 2:
+ print "please specify vsprops file"
+ sys.exit(1)
+
+ fname = sys.argv[1]
+ if fname.split(".")[-1] != "vsprops":
+ print "please specify vsprops file"
+ sys.exit(1)
+
+ f = file(sys.argv[1], "r")
+ text = f.read().replace("shift_jis", "utf-8")
+ f.close()
+
+ doc = minidom.parseString(text)
+
+ dict = {}
+ for node in doc.getElementsByTagName('UserMacro'):
+ name = node.getAttribute("Name")
+ value = node.getAttribute("Value")
+ # backslash -> slash
+ value = value.replace("\\", "/")
+ value = value.replace("\"", "")
+ value = re.sub("(SolutionDir)", "%RTM_ROOT%", value)
+ dict[name] = value
+ dict["user_lib"] = ""
+ dict["user_libd"] = ""
+ dict["omni_root"] = "${OMNIORB_DIR}"
+ dict["rtm_root"] = "${OPENRTM_DIR}"
+ dict["date"] = time.ctime()
+
+ # replace variables in actual values
+ for key in dict:
+ for varname in dict:
+ varexp = "$(" + varname + ")"
+ dict[key] = str(dict[key].replace(varexp, dict[varname]))
+
+ # cflags
+ omni_cflags = "-D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4"
+ omni_cflags += ";-D_CRT_SECURE_NO_DEPRECATE"
+
+ rtm_cflags = omni_cflags + ";-DINCLUDE_stub_in_nt_dll"
+ if re.match("^41", dict["omni_dllver"]):
+ rtm_cflags += ";-DRTC_CORBA_CXXMAPPING11;-D_WIN32_WINNT=0x0500"
+ else:
+ 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"])
+
+
+
+ dict["omniorb_cflags"] = omni_cflags
+ dict["omniorb_include_dirs"] = dict["omni_includes"]
+ dict["omniorb_ldflags"] = ""
+ dict["omniorb_library_dirs"] = dict["omni_libdir"]
+ dict["omniorb_libraries"] = omni_libs
+
+ 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_libs"] = str(rtm_libs)
+ dict["coil_include_dir"] = str(dict["rtm_libdir"])
+ dict["openrtm_include_dir"] = "%RTM_ROOT%"
+ dict["openrtm_libdir"] = "%RTM_ROOT%"
+ dict["openrtm_data_dir"] = "%RTM_ROOT%"
+ dict["openrtm_version"] = str(dict["rtm_version"])
+ dict["openrtm_version_major"] = str(dict["rtm_version"].split(".")[0])
+ dict["openrtm_version_minor"] = str(dict["rtm_version"].split(".")[1])
+ dict["openrtm_version_patch"] = str(dict["rtm_version"].split(".")[2])
+ dict["openrtm_short_version"] = str(dict["rtm_version"].replace(".",""))
+ dict["openrtm_orb"] = "omniORB"
+ dict["openrtm_idl_wrapper"] = "rtm-skelwrapper.py"
+ dict["openrtm_idl_wrapper_flags"] = '--include-dir="";--skel-suffix=Skel;--stub-suffix=Stub'
+ dict["openrtm_idlc"] = "omniidl"
+ dict["openrtm_idlflags"] = "-bcxx;-Wba;-nf;-I${OPENRTM_DIR}/rtm/idl"
+
+ t = yat.Template(template)
+ f = file("OpenRTMConfig.cmake", "w")
+ f.write(t.generate(dict))
+ f.close()
Modified: branches/RELENG_1_1/OpenRTM-aist/build/codegen.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/codegen.py 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/build/codegen.py 2011-06-06 00:32:16 UTC (rev 2176)
@@ -7,7 +7,6 @@
#
# Copyright (C) 2006
# Noriaki Ando
-# Task-intelligence Research Group,
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
Modified: branches/RELENG_1_1/OpenRTM-aist/build/makevcproj.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/makevcproj.py 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/build/makevcproj.py 2011-06-06 00:32:16 UTC (rev 2176)
@@ -6,7 +6,6 @@
#
# Copyright (C) 2007
# Noriaki Ando
-# Task-intelligence Research Group,
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
Modified: branches/RELENG_1_1/OpenRTM-aist/build/makewrapper.pl
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/makewrapper.pl 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/build/makewrapper.pl 2011-06-06 00:32:16 UTC (rev 2176)
@@ -5,7 +5,6 @@
# @author Norkai Ando <n-ando at aist.go.jp>
#
# Copyright (C) 2004-2005
-# Task-intelligence Research Group,
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
Modified: branches/RELENG_1_1/OpenRTM-aist/build/pickupprojs.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/pickupprojs.py 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/build/pickupprojs.py 2011-06-06 00:32:16 UTC (rev 2176)
@@ -6,7 +6,6 @@
#
# Copyright (C) 2007
# Noriaki Ando
-# Task-intelligence Research Group,
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
Modified: branches/RELENG_1_1/OpenRTM-aist/build/setuptest.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/setuptest.py 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/build/setuptest.py 2011-06-06 00:32:16 UTC (rev 2176)
@@ -7,7 +7,6 @@
#
# Copyright (C) 2006
# Noriaki Ando
-# Task-intelligence Research Group,
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
Modified: branches/RELENG_1_1/OpenRTM-aist/build/slntool.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/slntool.py 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/build/slntool.py 2011-06-06 00:32:16 UTC (rev 2176)
@@ -4,9 +4,8 @@
# @date $Date: 2008-03-06 06:46:37 $
# @author Norkai Ando <n-ando at aist.go.jp>
#
-# Copyright (C) 2008
-# Noriaki Ando
-# Task-intelligence Research Group,
+# Copyright (C) 2008-2011
+# Noriaki Ando, Tsuyoto Katami
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
Modified: branches/RELENG_1_1/OpenRTM-aist/build/vcprojtool.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/vcprojtool.py 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/build/vcprojtool.py 2011-06-06 00:32:16 UTC (rev 2176)
@@ -6,7 +6,6 @@
#
# Copyright (C) 2008
# Noriaki Ando
-# Task-intelligence Research Group,
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
Modified: branches/RELENG_1_1/OpenRTM-aist/build/vcxprojtool.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/vcxprojtool.py 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/build/vcxprojtool.py 2011-06-06 00:32:16 UTC (rev 2176)
@@ -5,8 +5,7 @@
# @author Norkai Ando <n-ando at aist.go.jp>
#
# Copyright (C) 2008
-# Noriaki Ando
-# Task-intelligence Research Group,
+# Tsuyoto Katami, Noriaki Ando
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
Modified: branches/RELENG_1_1/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/configure.ac 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/configure.ac 2011-06-06 00:32:16 UTC (rev 2176)
@@ -1693,6 +1693,7 @@
src/ext/sdo/logger/Makefile
utils/Makefile
utils/rtm-config/Makefile
+ utils/cmake/Makefile
utils/rtc-template/Makefile
utils/rtm-skelwrapper/Makefile
utils/rtm-naming/Makefile
@@ -1714,6 +1715,7 @@
win32/OpenRTM-aist/Makefile
win32/OpenRTM-aist/bin/Makefile
win32/OpenRTM-aist/etc/Makefile
+ win32/OpenRTM-aist/cmake/Makefile
win32/OpenRTM-aist/docs/Makefile
win32/OpenRTM-aist/build/Makefile
win32/OpenRTM-aist/examples/Makefile
Modified: branches/RELENG_1_1/OpenRTM-aist/etc/rtc.conf.sample
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/etc/rtc.conf.sample 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/etc/rtc.conf.sample 2011-06-06 00:32:16 UTC (rev 2176)
@@ -350,13 +350,13 @@
# SDO service settings
#============================================================
#
-# SDO service consumer settings
-#
-sdo.service.consumer.available_services: [read only]
-sdo.service.consumer.allowed_services: ALL
-#
# SDO service provider settings
#
sdo.service.provider.available_services: [read only]
-sdo.service.provider.allowed_services: ALL
+sdo.service.provider.enabled_services: ALL
sdo.service.provider.providing_services: [read only]
+#
+# SDO service consumer settings
+#
+sdo.service.consumer.available_services: [read only]
+sdo.service.consumer.enabled_services: ALL
Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh 2011-06-06 00:32:16 UTC (rev 2176)
@@ -97,9 +97,11 @@
#------------------------------------------------------------
# package build process
#------------------------------------------------------------
-packagedir=../../
+packagedir=`pwd`/../../
mkdir $packagedir/debian
+rm -f $packagedir/packages/openrtm-aist*
+
cp README.Debian $packagedir/debian/
cp changelog $packagedir/debian/
cp compat $packagedir/debian/
@@ -115,3 +117,5 @@
cd $packagedir
dpkg-buildpackage -W -us -uc -rfakeroot
+
+mv $packagedir/../openrtm-aist* $packagedir/packages/
\ No newline at end of file
Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/rules
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/rules 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/rules 2011-06-06 00:32:16 UTC (rev 2176)
@@ -102,6 +102,7 @@
(cd $(CURDIR)/utils/rtcd ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
(cd $(CURDIR)/utils/rtcprof ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
(cd $(CURDIR)/utils/rtm-naming ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
+ (cd $(CURDIR)/utils/rtm-config ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
(cd $(CURDIR)/src/ext ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install-exec)
# for openrtm-dev package
@@ -110,7 +111,7 @@
(cd $(CURDIR)/src/lib/coil ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install-data)
(cd $(CURDIR)/utils/rtc-template ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
(cd $(CURDIR)/utils/rtm-skelwrapper ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
- (cd $(CURDIR)/utils/rtm-config ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
+ (cd $(CURDIR)/utils/cmake ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
(cd $(CURDIR)/src/lib/coil/utils/coil-config ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
# for openrtm-aist-example package
Modified: branches/RELENG_1_1/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in 2011-06-06 00:32:16 UTC (rev 2176)
@@ -97,26 +97,28 @@
%files
/etc/rtc.conf.sample
%defattr(-,root,root,-)
+%attr(755,root,root) %{_bindir}/rtm-naming
+%attr(755,root,root) %{_bindir}/rtcd
+%attr(755,root,root) %{_bindir}/rtcprof
+%attr(755,root,root) %{_bindir}/rtm-config
%{_libdir}/libRTC*
%{_libdir}/libcoil*
%{rtm_libdir}/ec/*
%{rtm_libdir}/sdo/*
-#%{_libdir}/openrtm-%{shortversion}/ec/*
-#%{_libdir}/openrtm-%{shortversion}/sdo/*
#------------------------------------------------------------
# devel package file list
%files devel
%defattr(-,root,root,-)
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/rtc-template
+%attr(755,root,root) %{_bindir}/rtm-skelwrapper
+%attr(755,root,root) %{_bindir}/coil-config
%{rtm_includedir}/*
%{coil_includedir}/*
%{rtm_libdir}/py_helper/*
%{_libdir}/pkgconfig/*
-#%{rtm_libdir}/
-#%{_includedir}/*
-#%{_libdir}/openrtm-%{shortversion}/
+%{rtm_libdir}/cmake/*
#------------------------------------------------------------
@@ -124,8 +126,8 @@
%files doc
%defattr(-,root,root,-)
%{rtm_datadir}/doc/*
-#%{_datadir}/openrtm-%{shortversion}/doc/*
+
#------------------------------------------------------------
# example package file list
%files example
@@ -136,16 +138,14 @@
%{rtm_datadir}/example/src/*
%{rtm_datadir}/example/rtc/*
%{rtm_datadir}/example/templates/*
-#%attr(755,root,root) %{_datadir}/openrtm-%{shortversion}/example/*Comp*
-#%{_datadir}/openrtm-%{shortversion}/example/*.conf
-#%{_datadir}/openrtm-%{shortversion}/example/*.conf.org
-#%{_datadir}/openrtm-%{shortversion}/example/src/*
-#%{_datadir}/openrtm-%{shortversion}/example/rtc/*
-#%{_datadir}/openrtm-%{shortversion}/example/templates/*
+
#------------------------------------------------------------
# changelog section
%changelog
+* Thu Jun 4 2011 Noriaki Ando <n-ando at aist.go.jp> - 1.1.0-0._distname
+- CMakefile has been added.
+
* Thu May 7 2011 Noriaki Ando <n-ando at aist.go.jp> - 1.1.0-0._distname
- The 1.1.0 release of OpenRTM-aist.
Modified: branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/logger/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/logger/Makefile.am 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/logger/Makefile.am 2011-06-06 00:32:16 UTC (rev 2176)
@@ -66,7 +66,7 @@
socomp_LTLIBRARIES = LoggerConsumer.la
-dist_LoggerConsumer_la_SOURCES = \
+nodist_LoggerConsumer_la_SOURCES = \
$(LOGGER_DIST_SRC) $(LOGGER_DIST_H)
LoggerConsumer_la_LDFLAGS = -module
LoggerConsumer_la_DEPENDENCIES = libLoggerStub.la
Modified: branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.cpp 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.cpp 2011-06-06 00:32:16 UTC (rev 2176)
@@ -332,7 +332,6 @@
{
if (m_compstat.activatedListener == NULL)
{
- std::cout << "activateL attached" << std::endl;
m_compstat.activatedListener =
m_rtobj->addPostComponentActionListener(POST_ON_ACTIVATED,
m_compstat,
@@ -340,7 +339,6 @@
}
if (m_compstat.deactivatedListener == NULL)
{
- std::cout << "deactivateL attached" << std::endl;
m_compstat.deactivatedListener =
m_rtobj->addPostComponentActionListener(POST_ON_DEACTIVATED,
m_compstat,
@@ -348,7 +346,6 @@
}
if (m_compstat.resetListener == NULL)
{
- std::cout << "resetL attached" << std::endl;
m_compstat.resetListener =
m_rtobj->addPostComponentActionListener(POST_ON_RESET,
m_compstat,
@@ -356,7 +353,6 @@
}
if (m_compstat.abortingListener == NULL)
{
- std::cout << "abortL attached" << std::endl;
m_compstat.abortingListener =
m_rtobj->addPostComponentActionListener(POST_ON_ABORTING,
m_compstat,
@@ -364,7 +360,6 @@
}
if (m_compstat.finalizeListener == NULL)
{
- std::cout << "finalizeL attached" << std::endl;
m_compstat.finalizeListener =
m_rtobj->addPostComponentActionListener(POST_ON_FINALIZE,
m_compstat,
Modified: branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.h 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.h 2011-06-06 00:32:16 UTC (rev 2176)
@@ -123,9 +123,9 @@
* @brief Converting kind to string
* @endif
*/
- inline const char* toString(OpenRTM::StatusKind statuskind)
+ inline const char* toString(OpenRTM::StatusKind kind)
{
- static const char* kind[] =
+ static const char* kinds[] =
{
"COMPONENT_PROFILE",
"RTC_STATUS",
@@ -134,7 +134,7 @@
"CONFIGURATION",
"HEARTBEAT"
};
- return statuskind < sizeof(kind)/sizeof(char*) ? kind[statuskind] : "";
+ return (size_t)kind < sizeof(kind)/sizeof(char*) ? kinds[kind] : "";
}
/*!
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h 2011-06-06 00:32:16 UTC (rev 2176)
@@ -38,72 +38,74 @@
*/
static const char* default_config[] =
{
- "config.version", openrtm_version,
- "openrtm.name", openrtm_name,
- "openrtm.version", openrtm_version,
- "manager.instance_name", "manager",
- "manager.name", "manager",
- "manager.naming_formats", "%h.host_cxt/%n.mgr",
- "manager.pid", "",
- "manager.refstring_path", "/var/log/rtcmanager.ref",
- "os.name", "",
- "os.release", "",
- "os.version", "",
- "os.arch", "",
- "os.hostname", "",
- "logger.enable", "YES",
- "logger.file_name", "./rtc%p.log",
- "logger.date_format", "%b %d %H:%M:%S.%Q",
- "logger.log_level", "INFO",
- "logger.stream_lock", "NO",
- "logger.master_logger", "",
- "module.conf_path", "",
- "module.load_path", "",
- "naming.enable", "YES",
- "naming.type", "corba",
- "naming.formats", "%h.host_cxt/%n.rtc",
- "naming.update.enable", "YES",
- "naming.update.interval", "10.0",
- "timer.enable", "YES",
- "timer.tick", "0.1",
- "corba.args", "",
- "corba.endpoint", "", // hostname:port_number
- "corba.id", corba_name,
- "corba.nameservers", "localhost",
- "corba.master_manager", "localhost:2810",
- "corba.nameservice.replace_endpoint", "NO",
- "exec_cxt.periodic.type", "PeriodicExecutionContext",
- "exec_cxt.periodic.rate", "1000",
- "exec_cxt.evdriven.type", "EventDrivenExecutionContext",
- "manager.modules.load_path", "./",
- "manager.modules.abs_path_allowed", "YES",
- "manager.is_master", "NO",
- "manager.corba_servant", "YES",
- "manager.shutdown_on_nortcs", "YES",
- "manager.shutdown_auto", "YES",
- "manager.name", "manager",
- "manager.command", "rtcd",
- "manager.supported_languages", "C++, Python, Java",
- "manager.modules.C++.manager_cmd", "rtcd",
- "manager.modules.C++.profile_cmd", "rtcprof",
-#ifdef WIN32
- "manager.modules.C++.suffixes", "dll",
-#else
-#ifdef RTM_OS_DARWIN
- "manager.modules.C++.suffixes", "dylib",
-#else
- "manager.modules.C++.suffixes", "so",
-#endif
-#endif
- "manager.modules.C++.load_paths", "./",
- "manager.modules.Python.manager_cmd", "rtcd_python",
- "manager.modules.Python.profile_cmd", "rtcprof_python",
- "manager.modules.Python.suffixes", "py",
- "manager.modules.Python.load_paths", "./",
- "manager.modules.Java.manager_cmd", "rtcd_java",
- "manager.modules.Java.profile_cmd", "rtcprof_java",
- "manager.modules.Java.suffixes", "class",
- "manager.modules.Java.load_paths", "./",
+ "config.version", openrtm_version,
+ "openrtm.name", openrtm_name,
+ "openrtm.version", openrtm_version,
+ "manager.instance_name", "manager",
+ "manager.name", "manager",
+ "manager.naming_formats", "%h.host_cxt/%n.mgr",
+ "manager.pid", "",
+ "manager.refstring_path", "/var/log/rtcmanager.ref",
+ "os.name", "",
+ "os.release", "",
+ "os.version", "",
+ "os.arch", "",
+ "os.hostname", "",
+ "logger.enable", "YES",
+ "logger.file_name", "./rtc%p.log",
+ "logger.date_format", "%b %d %H:%M:%S.%Q",
+ "logger.log_level", "INFO",
+ "logger.stream_lock", "NO",
+ "logger.master_logger", "",
+ "module.conf_path", "",
+ "module.load_path", "",
+ "naming.enable", "YES",
+ "naming.type", "corba",
+ "naming.formats", "%h.host_cxt/%n.rtc",
+ "naming.update.enable", "YES",
+ "naming.update.interval", "10.0",
+ "timer.enable", "YES",
+ "timer.tick", "0.1",
+ "corba.args", "",
+ "corba.endpoint", "", // hostname:port_number
+ "corba.id", corba_name,
+ "corba.nameservers", "localhost",
+ "corba.master_manager", "localhost:2810",
+ "corba.nameservice.replace_endpoint", "NO",
+ "exec_cxt.periodic.type", "PeriodicExecutionContext",
+ "exec_cxt.periodic.rate", "1000",
+ "exec_cxt.evdriven.type", "EventDrivenExecutionContext",
+ "manager.modules.load_path", "./",
+ "manager.modules.abs_path_allowed", "YES",
+ "manager.is_master", "NO",
+ "manager.corba_servant", "YES",
+ "manager.shutdown_on_nortcs", "YES",
+ "manager.shutdown_auto", "YES",
+ "manager.name", "manager",
+ "manager.command", "rtcd",
+ "manager.supported_languages", "C++, Python, Java",
+ "manager.modules.C++.manager_cmd", "rtcd",
+ "manager.modules.C++.profile_cmd", "rtcprof",
+#ifdef WIN32
+ "manager.modules.C++.suffixes", "dll",
+#else
+#ifdef RTM_OS_DARWIN
+ "manager.modules.C++.suffixes", "dylib",
+#else
+ "manager.modules.C++.suffixes", "so",
+#endif
+#endif
+ "manager.modules.C++.load_paths", "./",
+ "manager.modules.Python.manager_cmd", "rtcd_python",
+ "manager.modules.Python.profile_cmd", "rtcprof_python",
+ "manager.modules.Python.suffixes", "py",
+ "manager.modules.Python.load_paths", "./",
+ "manager.modules.Java.manager_cmd", "rtcd_java",
+ "manager.modules.Java.profile_cmd", "rtcprof_java",
+ "manager.modules.Java.suffixes", "class",
+ "manager.modules.Java.load_paths", "./",
+ "sdo.service.provider.enabled_service", "ALL",
+ "sdo.service.consumer.enabled_service", "ALL",
""
};
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am 2011-06-06 00:32:16 UTC (rev 2176)
@@ -146,6 +146,7 @@
PublisherBase.h \
RTC.h \
RingBuffer.h \
+ SdoServiceProviderBase.h \
SdoServiceConsumerBase.h \
StateMachine.h \
Typename.h \
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2011-06-06 00:32:16 UTC (rev 2176)
@@ -1914,6 +1914,57 @@
/*!
* @if jp
+ * @brief [local interface] SDO service provider をセットする
+ * @else
+ * @brief [local interface] Set a SDO service provider
+ * @endif
+ */
+ bool RTObject_impl::
+ addSdoServiceProvider(const SDOPackage::ServiceProfile& prof,
+ SdoServiceProviderBase* provider)
+ {
+ return m_sdoservice.addSdoServiceProvider(prof, provider);
+ }
+
+ /*!
+ * @if jp
+ * @brief [local interface] SDO service provider を削除する
+ * @else
+ * @brief [local interface] Remove a SDO service provider
+ * @endif
+ */
+ bool RTObject_impl::removeSdoServiceProvider(const char* id)
+ {
+ return m_sdoservice.removeSdoServiceProvider(id);
+ }
+
+ /*!
+ * @if jp
+ * @brief [local interface] SDO service provider をセットする
+ * @else
+ * @brief [local interface] Set a SDO service provider
+ * @endif
+ */
+ bool RTObject_impl::
+ addSdoServiceConsumer(const SDOPackage::ServiceProfile& prof)
+ {
+ return m_sdoservice.addSdoServiceConsumer(prof);
+ }
+
+ /*!
+ * @if jp
+ * @brief [local interface] SDO service provider を削除する
+ * @else
+ * @brief [local interface] Remove a SDO service provider
+ * @endif
+ */
+ bool RTObject_impl::removeSdoServiceConsumer(const char* id)
+ {
+ return m_sdoservice.removeSdoServiceConsumer(id);
+ }
+
+ /*!
+ * @if jp
* @brief 全 InPort のデータを読み込む。
* @return 読み込み結果(全ポートの読み込み成功:true，失敗:false)
* @else
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.h 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.h 2011-06-06 00:32:16 UTC (rev 2176)
@@ -3118,6 +3118,43 @@
/*!
* @if jp
+ * @brief [local interface] SDO service provider をセットする
+ * @else
+ * @brief [local interface] Set a SDO service provider
+ * @endif
+ */
+ bool addSdoServiceProvider(const SDOPackage::ServiceProfile& prof,
+ SdoServiceProviderBase* provider);
+
+ /*!
+ * @if jp
+ * @brief [local interface] SDO service provider を削除する
+ * @else
+ * @brief [local interface] Remove a SDO service provider
+ * @endif
+ */
+ bool removeSdoServiceProvider(const char* id);
+
+ /*!
+ * @if jp
+ * @brief [local interface] SDO service provider をセットする
+ * @else
+ * @brief [local interface] Set a SDO service provider
+ * @endif
+ */
+ bool addSdoServiceConsumer(const SDOPackage::ServiceProfile& prof);
+
+ /*!
+ * @if jp
+ * @brief [local interface] SDO service provider を削除する
+ * @else
+ * @brief [local interface] Remove a SDO service provider
+ * @endif
+ */
+ bool removeSdoServiceConsumer(const char* id);
+
+ /*!
+ * @if jp
*
* @brief 全 InPort のデータを読み込む。
*
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp 2011-06-06 00:32:16 UTC (rev 2176)
@@ -57,7 +57,7 @@
* @endif
*/
SdoServiceAdmin::SdoServiceAdmin(::RTC::RTObject_impl& rtobj)
- : m_rtobj(rtobj), m_allConsumerAllowed(true),
+ : m_rtobj(rtobj), m_allConsumerEnabled(true),
rtclog("SdoServiceAdmin")
{
RTC_TRACE(("SdoServiceAdmin::SdoServiceAdmin(%s)",
@@ -67,10 +67,10 @@
//------------------------------------------------------------
// SDO service provider
- ::coil::vstring allowedProviderTypes
- = ::coil::split(prop["sdo.service.provider.allowed_services"], ",", true);
- RTC_DEBUG(("sdo.service.provider.allowed_services: %s",
- prop["sdo.service.provider.allowed_services"].c_str()));
+ ::coil::vstring enabledProviderTypes
+ = ::coil::split(prop["sdo.service.provider.enabled_services"], ",", true);
+ RTC_DEBUG(("sdo.service.provider.enabled_services: %s",
+ prop["sdo.service.provider.enabled_services"].c_str()));
::coil::vstring availableProviderTypes
= SdoServiceProviderFactory::instance().getIdentifiers();
@@ -80,21 +80,21 @@
prop["sdo.service.provider.available_services"].c_str()));
- // If types include '[Aa][Ll][Ll]', all types allowed in this RTC
+ // If types include '[Aa][Ll][Ll]', all types enabled in this RTC
::coil::vstring activeProviderTypes;
- for (size_t i(0); i < allowedProviderTypes.size(); ++i)
+ for (size_t i(0); i < enabledProviderTypes.size(); ++i)
{
- std::string tmp(allowedProviderTypes[i]);
+ std::string tmp(enabledProviderTypes[i]);
coil::toLower(tmp);
if (tmp == "all")
{
activeProviderTypes = availableProviderTypes;
- RTC_DEBUG(("sdo.service.provider.allowed_services: ALL"));
+ RTC_DEBUG(("sdo.service.provider.enabled_services: ALL"));
break;
}
for (size_t j(0); j < availableProviderTypes.size(); ++j)
{
- if (availableProviderTypes[j] == allowedProviderTypes[i])
+ if (availableProviderTypes[j] == enabledProviderTypes[i])
{
activeProviderTypes.push_back(availableProviderTypes[j]);
}
@@ -123,24 +123,24 @@
// SDO service consumer
// getting consumer types from RTC's properties
- ::std::string constypes = prop["sdo.service.consumer.allowed_services"];
+ ::std::string constypes = prop["sdo.service.consumer.enabled_services"];
m_consumerTypes = ::coil::split(constypes, ",", true);
- RTC_DEBUG(("sdo.service.consumer.allowed_services: %s", constypes.c_str()));
+ RTC_DEBUG(("sdo.service.consumer.enabled_services: %s", constypes.c_str()));
prop["sdo.service.consumer.available_services"]
= coil::flatten(SdoServiceConsumerFactory::instance().getIdentifiers());
RTC_DEBUG(("sdo.service.consumer.available_services: %s",
prop["sdo.service.consumer.available_services"].c_str()));
- // If types include '[Aa][Ll][Ll]', all types allowed in this RTC
+ // If types include '[Aa][Ll][Ll]', all types enabled in this RTC
for (size_t i(0); i < m_consumerTypes.size(); ++i)
{
std::string tmp(m_consumerTypes[i]);
coil::toLower(tmp);
if (tmp == "all")
{
- m_allConsumerAllowed = true;
- RTC_DEBUG(("sdo.service.consumer.allowed_services: ALL"));
+ m_allConsumerEnabled = true;
+ RTC_DEBUG(("sdo.service.consumer.enabled_services: ALL"));
}
}
}
@@ -230,6 +230,69 @@
/*!
* @if jp
+ * @brief SDO service provider をセットする
+ * @else
+ * @brief Set a SDO service provider
+ * @endif
+ */
+ bool SdoServiceAdmin::
+ addSdoServiceProvider(const SDOPackage::ServiceProfile& prof,
+ SdoServiceProviderBase* provider)
+ {
+ RTC_TRACE(("SdoServiceAdmin::addSdoServiceProvider(if=%s)",
+ static_cast<const char*>(prof.interface_type)));
+ Guard guard(m_provider_mutex);
+
+ std::string id(static_cast<const char*>(prof.id));
+ for (size_t i(0); i < m_providers.size(); ++i)
+ {
+ if (id == static_cast<const char*>(m_providers[i]->getProfile().id))
+ {
+ RTC_ERROR(("SDO service(id=%s, ifr=%s) already exists",
+ static_cast<const char*>(prof.id),
+ static_cast<const char*>(prof.interface_type)));
+ return false;
+ }
+ }
+ m_providers.push_back(provider);
+ return true;
+ }
+
+ /*!
+ * @if jp
+ * @brief SDO service provider を削除する
+ * @else
+ * @brief Remove a SDO service provider
+ * @endif
+ */
+ bool SdoServiceAdmin::removeSdoServiceProvider(const char* id)
+ {
+ RTC_TRACE(("removeSdoServiceProvider(%d)", id));
+ Guard gurad(m_provider_mutex);
+
+ std::string strid(id);
+ std::vector<SdoServiceProviderBase*>::iterator it = m_providers.begin();
+ std::vector<SdoServiceProviderBase*>::iterator it_end = m_providers.end();
+ while (it != it_end)
+ {
+ if (strid == static_cast<const char*>((*it)->getProfile().id))
+ {
+ (*it)->finalize();
+ SdoServiceProviderFactory&
+ factory(SdoServiceProviderFactory::instance());
+ factory.deleteObject(*it);
+ m_providers.erase(it);
+ RTC_INFO(("SDO service provider has been deleted: %s", id));
+ return true;
+ }
+ ++it;
+ }
+ RTC_WARN(("Specified SDO service provider not found: %s", id));
+ return false;
+ }
+
+ /*!
+ * @if jp
* @brief Service Consumer を追加する
* @else
* @brief Add Service Consumer
@@ -243,7 +306,7 @@
static_cast<const char*>(sProfile.interface_type)));
// Not supported consumer type -> error return
- if (!isAllowedConsumerType(sProfile)) { return false; }
+ if (!isEnabledConsumerType(sProfile)) { return false; }
if (!isExistingConsumerType(sProfile)) { return false; }
RTC_DEBUG(("Valid SDO service required"));
if (strncmp(sProfile.id, "", 1) == 0)
@@ -352,13 +415,13 @@
* @if jp
* @brief 許可されたサービス型かどうか調べる
* @else
- * @brief If it is allowed service type
+ * @brief If it is enabled service type
* @endif
*/
bool SdoServiceAdmin::
- isAllowedConsumerType(const SDOPackage::ServiceProfile& sProfile)
+ isEnabledConsumerType(const SDOPackage::ServiceProfile& sProfile)
{
- if (m_allConsumerAllowed) { return true; }
+ if (m_allConsumerEnabled) { return true; }
for (size_t i(0); i < m_consumerTypes.size(); ++i)
{
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h 2011-06-06 00:32:16 UTC (rev 2176)
@@ -259,6 +259,25 @@
/*!
* @if jp
+ * @brief SDO service provider をセットする
+ * @else
+ * @brief Set a SDO service provider
+ * @endif
+ */
+ bool addSdoServiceProvider(const SDOPackage::ServiceProfile& prof,
+ SdoServiceProviderBase* provider);
+
+ /*!
+ * @if jp
+ * @brief SDO service provider を削除する
+ * @else
+ * @brief Remove a SDO service provider
+ * @endif
+ */
+ bool removeSdoServiceProvider(const char* id);
+
+ /*!
+ * @if jp
*
* @brief Service Consumer を追加する
*
@@ -291,11 +310,11 @@
*
* @else
*
- * @brief If it is allowed service type
+ * @brief If it is enabled service type
*
* @endif
*/
- bool isAllowedConsumerType(const SDOPackage::ServiceProfile& sProfile);
+ bool isEnabledConsumerType(const SDOPackage::ServiceProfile& sProfile);
/*!
* @if jp
@@ -318,7 +337,7 @@
private:
RTC::RTObject_impl& m_rtobj;
coil::vstring m_consumerTypes;
- bool m_allConsumerAllowed;
+ bool m_allConsumerEnabled;
/*!
* @if jp
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/Makefile.am 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/Makefile.am 2011-06-06 00:32:16 UTC (rev 2176)
@@ -7,5 +7,5 @@
AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = rtm-config rtc-template rtm-skelwrapper rtm-naming rtcd rtcprof
+SUBDIRS = rtm-config cmake rtc-template rtm-skelwrapper rtm-naming rtcd rtcprof
Property changes on: branches/RELENG_1_1/OpenRTM-aist/utils/cmake
___________________________________________________________________
Added: svn:ignore
+ svn: warning: cannot set LC_CTYPE locale
svn: warning: environment variable LANG is JPN
svn: warning: please check that your locale name is correct
Makefile.in
Deleted: branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake 2011-06-05 17:48:59 UTC (rev 2172)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake 2011-06-06 00:32:16 UTC (rev 2176)
@@ -1,382 +0,0 @@
-# -*- cmake -*-
-#
-# @file FindOpenRTM.cmake
-# @brief Find script for cmake
-#
-# $Id$
-#
-# omniORB variables
-# - OMNIORB_DIR:
-# - OMNIORB_CFLAGS: cflags
-# - OMNIORB_INCLUDE_DIRS:
-# - OMNIORB_LDFLAGS: linker flags
-# - OMNIORB_LIBRARY_DIRS:
-# - OMNIORB_LIBRARIES:
-#
-# OpenRTM variables used in RTC's CMakeList.txt
-# - OPENRTM_CFLAGS: cflags (-Wall -O etc.)
-# - OPENRTM_INCLUDE_DIRS: include directory options (-I<dir0> -I<dir1>)
-# - OPENRTM_LDFLAGS: linker options
-# - OPENRTM_LIBRARY_DIRS: library directories (-L/usr/local/share etc...)
-# - OPENRTM_LIBRARIES: libraries (-lcoil etc...)
-# - OPENRTM_DIR: (C:\Program Files\OpenRTM-aist\1.1 for only windows)
-# - OPENRTM_VERSION_MAJOR: major version number
-# - OPENRTM_VERSION_MINOR: minor version number
-# - OPENRTM_IDL_WRAPPER: rtm-skelwrapper command
-# - OPENRTM_IDL_WRAPPER_FLAGS: rtm-skelwrapper flag
-# - OPENRTM_IDLC: IDL command
-# - OPENRTM_IDLFLAGS: IDL optins
-# - OPENRTM_VERSION: x.y.x version string
-#
-
-set(OMNIORB_FOUND FALSE)
-set(OPENRTM_FOUND FALSE)
-
-#------------------------------------------------------------
-# UNIX
-# this script use pkg-config
-#
-# 1. include pkg-config function
-# 2. find omniORB
-# - OMNIORB_CFLAGS
-# - OMNIORB_LDFLAGS
-# 3. find OpenRTM-aist
-# - OPENRTM_CFLAGS
-#
-#
-#
-#------------------------------------------------------------
-if(UNIX)
- include(FindPkgConfig)
-
- #
- # Getting omniORB settings
- #
- pkg_check_modules(OMNIORB REQUIRED "omniORB4")
- if(NOT OMNIORB_DIR)
- if(OMNIORB_FOUND)
- set(OMNIORB_DIR "${OMNIORB_PREFIX}")
- endif()
- set(OMNIORB_DIR "${OMNIORB_DIR}" CACHE PATH "omniORB root directory")
- endif()
-
- set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS_OTHER})
- set(OMNIORB_LDFLAGS ${OMNIORB_LDFLAGS_OTHER})
-
- #
- # Getting OpenRTM-aist settings
- #
- pkg_check_modules(OPENRTM REQUIRED "openrtm-aist")
- if(NOT OPENRTM_DIR)
- if(OPENRTM_FOUND)
- set(OPENRTM_DIR "${OPENRTM_PREFIX}")
- endif()
- set(OPENRTM_DIR "${OPENRTM_DIR}" CACHE PATH "OpenRTM-aist root directory")
- endif()
-
- set(OPENRTM_CFLAGS ${OPENRTM_CFLAGS_OTHER})
- set(OPENRTM_LDFLAGS ${OPENRTM_LDFLAGS_OTHER})
-
- #
- # Getting OPENRTM_VERSION_MAJOR/MINOR/PATCH
- #
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
- OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
- OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
- OPENRTM_VERSION_PATCH "${OPENRTM_VERSION}")
-
- #
- # Getting IDL Compiler settings
- #
- set(OPENRTM_IDLC "")
- set(OPENRTM_IDLFLAGS "")
-
- execute_process(COMMAND rtm-config --idlc
- RESULT_VARIABLE result_val
- OUTPUT_VARIABLE output_val
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(result_val EQUAL 0)
- set(OPENRTM_IDLC "${output_val}")
- endif()
-
- execute_process(COMMAND rtm-config --idlflags
- RESULT_VARIABLE result_val
- OUTPUT_VARIABLE output_val
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(result_val EQUAL 0)
- string(REPLACE " " ";" output_val ${output_val})
- set(OPENRTM_IDLFLAGS ${output_val} "-I${OPENRTM_DIR}/include/rtm/idl")
- endif()
-
- #
- # Getting IDL Skelton wrapper generator settings
- #
- set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper")
- set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
-
-endif(UNIX)
-
-set(WIN32_RTM "")
-set(RTM_CONFIG_CMAKE "")
-
-macro(rtm_norm_path _path _result)
- string(REGEX REPLACE "\"" "" _var "${_path}")
- string(REGEX REPLACE "[/]+" "/" _var "${_var}")
- string(REGEX REPLACE "[/]$" "" _var "${_var}")
- set(${_result} "${_var}")
-endmacro(rtm_norm_path)
-
-#------------------------------------------------------------
-# Windows
-#------------------------------------------------------------
-if(WIN32)
- set(WIN32_RTM "10")
- find_file(rtm_conf "rtm_config.cmake" PATHS "$ENV{RTM_ROOT}/cmake")
- if(rtm_conf)
- set(WIN32_RTM "11")
- set(RTM_CONFIG_CMAKE "${rtm_conf}")
- endif()
-endif(WIN32)
-
-if(WIN32_RTM STREQUAL "11")
- include("${RTM_CONFIG_CMAKE}")
- message(STATUS "Configuration by ${RTM_CONFIG_CMAKE}.")
-
- # omniORB
- set(OMNIORB_DIR "${omni_root}")
- set(OMNIORB_FOUND TRUE)
- file(TO_CMAKE_PATH "${OMNIORB_DIR}" OMNIORB_DIR)
-
- foreach(path ${omni_includes})
- file(TO_CMAKE_PATH "${path}" path)
- rtm_norm_path("${path}" path)
- list(APPEND OMNIORB_INCLUDE_DIRS "${path}")
- endforeach()
- foreach(path ${omni_libdir})
- file(TO_CMAKE_PATH "${path}" path)
- rtm_norm_path("${path}" path)
- list(APPEND OMNIORB_LIBRARY_DIRS "${path}")
- endforeach()
-
- # omniORB version
- file(GLOB _vers RELATIVE "${OMNIORB_DIR}" "${OMNIORB_DIR}/THIS_IS_OMNIORB*")
- if("${_vers}" STREQUAL "")
- message(FATAL_ERROR "omniORB version file not found.")
- endif()
-
- set(OMNIORB_VERSION "${_vers}")
- string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
- OMNIORB_VERSION "${OMNIORB_VERSION}")
- string(REGEX REPLACE "[_]" "."
- OMNIORB_VERSION "${OMNIORB_VERSION}")
-
- set(OMNIORB_VERSION_NUM "${omni_dllver}")
- set(OMNIORB_THREAD_NUM "${omnithread_dllver}")
-
- set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
- if(${OMNIORB_VERSION_NUM} MATCHES "^40")
- set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
- else()
- set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
- endif()
-
- string(REGEX REPLACE " " ";" libs "${omni_lib}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
- list(APPEND OMNIORB_LIBRARIES optimized "${library}")
- endforeach()
- string(REGEX REPLACE " " ";" libs "${omni_libd}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
- list(APPEND OMNIORB_LIBRARIES debug "${library}")
- endforeach()
-
- # OpenRTM-aist
- set(OPENRTM_DIR "${rtm_root}")
- set(OPENRTM_FOUND TRUE)
- file(TO_CMAKE_PATH "${OPENRTM_DIR}" OPENRTM_DIR)
-
- # OpenRTM-aist version
- set(OPENRTM_VERSION "${rtm_version}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
- OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
- OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
- OPENRTM_VERSION_PATCH "${OPENRTM_VERSION}")
-
- set(OPENRTM_VERSION_NUM "${rtm_dllver}")
-
- foreach(path ${rtm_includes})
- file(TO_CMAKE_PATH "${path}" path)
- rtm_norm_path("${path}" path)
- list(APPEND OPENRTM_INCLUDE_DIRS "${path}")
- endforeach()
- foreach(path ${rtm_libdir})
- file(TO_CMAKE_PATH "${path}" path)
- rtm_norm_path("${path}" path)
- list(APPEND OPENRTM_LIBRARY_DIRS "${path}")
- endforeach()
-
- set(OPENRTM_CFLAGS "-DINCLUDE_stub_in_nt_dll")
-
- string(REGEX REPLACE " " ";" libs "${rtm_lib}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
- list(APPEND OPENRTM_LIBRARIES optimized "${library}")
- endforeach()
- string(REGEX REPLACE " " ";" libs "${coil_lib}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
- list(APPEND OPENRTM_LIBRARIES optimized "${library}")
- endforeach()
-
- string(REGEX REPLACE " " ";" libs "${rtm_libd}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
- list(APPEND OPENRTM_LIBRARIES debug "${library}")
- endforeach()
- string(REGEX REPLACE " " ";" libs "${coil_libd}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
- list(APPEND OPENRTM_LIBRARIES debug "${library}")
- endforeach()
-
- # IDL Compiler
- set(OPENRTM_IDLC "${rtm_idlc}")
- string(REGEX REPLACE " " ";" flags "${rtm_idlflags}")
- foreach(flag ${flags})
- string(REGEX REPLACE "\\$\\(SolutionDir\\)" "${OPENRTM_DIR}" flag "${flag}")
- string(REGEX REPLACE "[\\]" "/" flag "${flag}")
- list(APPEND OPENRTM_IDLFLAGS "${flag}")
- endforeach()
-
- # IDL Skelton Wrapper
- set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
- set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
-
-endif(WIN32_RTM STREQUAL "11")
-
-if(WIN32_RTM STREQUAL "10")
- # omniORB
- if(NOT OMNIORB_DIR)
- if(NOT $ENV{OMNI_ROOT} STREQUAL "")
- set(OMNIORB_DIR "$ENV{OMNI_ROOT}")
- set(OMNIORB_FOUND TRUE)
- endif()
- set(OMNIORB_DIR "${OMNIORB_DIR}" CACHE PATH "omniORB root directory")
- if(NOT OMNIORB_FOUND)
- message(FATAL_ERROR "omniORB not found.")
- endif()
- endif()
-
- set(OMNIORB_INCLUDE_DIRS "${OMNIORB_DIR}/include")
- set(OMNIORB_LIBRARY_DIRS "${OMNIORB_DIR}/lib/x86_win32")
-
- # omniORB version
- file(GLOB _vers RELATIVE "${OMNIORB_DIR}" "${OMNIORB_DIR}/THIS_IS_OMNIORB*")
- if("${_vers}" STREQUAL "")
- message(FATAL_ERROR "omniORB version file not found.")
- endif()
-
- set(OMNIORB_VERSION "${_vers}")
- string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
- OMNIORB_VERSION "${OMNIORB_VERSION}")
- string(REGEX REPLACE "[_]" "."
- OMNIORB_VERSION "${OMNIORB_VERSION}")
- string(REGEX REPLACE "[.]" ""
- OMNIORB_VERSION_NUM "${OMNIORB_VERSION}")
-
- # omnithread version
- file(GLOB _vers RELATIVE "${OMNIORB_LIBRARY_DIRS}" "${OMNIORB_LIBRARY_DIRS}/omnithread*")
- if("${_vers}" STREQUAL "")
- message(FATAL_ERROR "omnithread not found.")
- endif()
- string(REGEX REPLACE ".*omnithread([0-9]+)_rt\\.lib.*" "\\1"
- OMNIORB_THREAD_NUM "${_vers}")
-
- set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
- if(${OMNIORB_VERSION_NUM} MATCHES "^40")
- set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
- else()
- set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
- endif()
-
- foreach(library "omniORB${OMNIORB_VERSION_NUM}_rt"
- "omniDynamic${OMNIORB_VERSION_NUM}_rt"
- "omnithread${OMNIORB_THREAD_NUM}_rt")
- list(APPEND OMNIORB_LIBRARIES optimized "${library}" debug "${library}d")
- endforeach()
-
- # OpenRTM-aist
- if(NOT OPENRTM_DIR)
- if(NOT $ENV{RTM_ROOT} STREQUAL "")
- set(OPENRTM_DIR "$ENV{RTM_ROOT}")
- set(OPENRTM_FOUND TRUE)
- endif()
- set(OPENRTM_DIR "${OPENRTM_DIR}" CACHE PATH "OpenRTM-aist root directory")
- if(NOT OPENRTM_FOUND)
- message(FATAL_ERROR "OpenRTM-aist not found.")
- endif()
- endif()
-
- # OpenRTM-aist version
- set(OPENRTM_VERSION "${OPENRTM_DIR}")
- string(REGEX REPLACE ".*OpenRTM-aist/" "" OPENRTM_VERSION "${OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1" OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\2" OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
- set(OPENRTM_VERSION_PATCH "0")
- set(OPENRTM_VERSION "${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}.${OPENRTM_VERSION_PATCH}")
- string(REGEX REPLACE "[.]" ""
- OPENRTM_VERSION_NUM "${OPENRTM_VERSION}")
-
- set(OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}")
- set(OPENRTM_LIBRARY_DIRS "${OPENRTM_DIR}/bin")
- list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/rtm/idl")
-
- set(OPENRTM_CFLAGS "-DINCLUDE_stub_in_nt_dll")
-
- foreach(library "RTC${OPENRTM_VERSION_NUM}" "coil")
- list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
- endforeach()
- foreach(library "ws2_32" "mswsock")
- list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}")
- endforeach()
-
- # IDL Compiler
- set(OPENRTM_IDLC "omniidl")
- set(OPENRTM_IDLFLAGS -bcxx -Wba -nf)
-
- # IDL Skelton Wrapper
- set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
- set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
-
-endif(WIN32_RTM STREQUAL "10")
-
-message(STATUS "FindOpenRTM setup done.")
-
-message(STATUS " OMNIORB_DIR=${OMNIORB_DIR}")
-message(STATUS " OMNIORB_VERSION=${OMNIORB_VERSION}")
-message(STATUS " OMNIORB_CFLAGS=${OMNIORB_CFLAGS}")
-message(STATUS " OMNIORB_INCLUDE_DIRS=${OMNIORB_INCLUDE_DIRS}")
-message(STATUS " OMNIORB_LDFLAGS=${OMNIORB_LDFLAGS}")
-message(STATUS " OMNIORB_LIBRARY_DIRS=${OMNIORB_LIBRARY_DIRS}")
-message(STATUS " OMNIORB_LIBRARIES=${OMNIORB_LIBRARIES}")
-
-message(STATUS " OPENRTM_DIR=${OPENRTM_DIR}")
-message(STATUS " OPENRTM_VERSION=${OPENRTM_VERSION}")
-message(STATUS " OPENRTM_VERSION_MAJOR=${OPENRTM_VERSION_MAJOR}")
-message(STATUS " OPENRTM_VERSION_MINOR=${OPENRTM_VERSION_MINOR}")
-message(STATUS " OPENRTM_VERSION_PATCH=${OPENRTM_VERSION_PATCH}")
-message(STATUS " OPENRTM_CFLAGS=${OPENRTM_CFLAGS}")
-message(STATUS " OPENRTM_INCLUDE_DIRS=${OPENRTM_INCLUDE_DIRS}")
-message(STATUS " OPENRTM_LDFLAGS=${OPENRTM_LDFLAGS}")
-message(STATUS " OPENRTM_LIBRARY_DIRS=${OPENRTM_LIBRARY_DIRS}")
-message(STATUS " OPENRTM_LIBRARIES=${OPENRTM_LIBRARIES}")
-
-message(STATUS " OPENRTM_IDLC=${OPENRTM_IDLC}")
-message(STATUS " OPENRTM_IDLFLAGS=${OPENRTM_IDLFLAGS}")
-message(STATUS " OPENRTM_IDL_WRAPPER=${OPENRTM_IDL_WRAPPER}")
-message(STATUS " OPENRTM_IDL_WRAPPER_FLAGS=${OPENRTM_IDL_WRAPPER_FLAGS}")
Copied: branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake (from rev 2172, trunk/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake 2011-06-06 00:32:16 UTC (rev 2176)
@@ -0,0 +1,382 @@
+# -*- cmake -*-
+#
+# @file FindOpenRTM.cmake
+# @brief Find script for cmake
+#
+# $Id$
+#
+# omniORB variables
+# - OMNIORB_DIR:
+# - OMNIORB_CFLAGS: cflags
+# - OMNIORB_INCLUDE_DIRS:
+# - OMNIORB_LDFLAGS: linker flags
+# - OMNIORB_LIBRARY_DIRS:
+# - OMNIORB_LIBRARIES:
+#
+# OpenRTM variables used in RTC's CMakeList.txt
+# - OPENRTM_CFLAGS: cflags (-Wall -O etc.)
+# - OPENRTM_INCLUDE_DIRS: include directory options (-I<dir0> -I<dir1>)
+# - OPENRTM_LDFLAGS: linker options
+# - OPENRTM_LIBRARY_DIRS: library directories (-L/usr/local/share etc...)
+# - OPENRTM_LIBRARIES: libraries (-lcoil etc...)
+# - OPENRTM_DIR: (C:\Program Files\OpenRTM-aist\1.1 for only windows)
+# - OPENRTM_VERSION_MAJOR: major version number
+# - OPENRTM_VERSION_MINOR: minor version number
+# - OPENRTM_IDL_WRAPPER: rtm-skelwrapper command
+# - OPENRTM_IDL_WRAPPER_FLAGS: rtm-skelwrapper flag
+# - OPENRTM_IDLC: IDL command
+# - OPENRTM_IDLFLAGS: IDL optins
+# - OPENRTM_VERSION: x.y.x version string
+#
+
+set(OMNIORB_FOUND FALSE)
+set(OPENRTM_FOUND FALSE)
+
+#------------------------------------------------------------
+# UNIX
+# this script use pkg-config
+#
+# 1. include pkg-config function
+# 2. find omniORB
+# - OMNIORB_CFLAGS
+# - OMNIORB_LDFLAGS
+# 3. find OpenRTM-aist
+# - OPENRTM_CFLAGS
+#
+#
+#
+#------------------------------------------------------------
+if(UNIX)
+ include(FindPkgConfig)
+
+ #
+ # Getting omniORB settings
+ #
+ pkg_check_modules(OMNIORB REQUIRED "omniORB4")
+ if(NOT OMNIORB_DIR)
+ if(OMNIORB_FOUND)
+ set(OMNIORB_DIR "${OMNIORB_PREFIX}")
+ endif()
+ set(OMNIORB_DIR "${OMNIORB_DIR}" CACHE PATH "omniORB root directory")
+ endif()
+
+ set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS_OTHER})
+ set(OMNIORB_LDFLAGS ${OMNIORB_LDFLAGS_OTHER})
+
+ #
+ # Getting OpenRTM-aist settings
+ #
+ pkg_check_modules(OPENRTM REQUIRED "openrtm-aist")
+ if(NOT OPENRTM_DIR)
+ if(OPENRTM_FOUND)
+ set(OPENRTM_DIR "${OPENRTM_PREFIX}")
+ endif()
+ set(OPENRTM_DIR "${OPENRTM_DIR}" CACHE PATH "OpenRTM-aist root directory")
+ endif()
+
+ set(OPENRTM_CFLAGS ${OPENRTM_CFLAGS_OTHER})
+ set(OPENRTM_LDFLAGS ${OPENRTM_LDFLAGS_OTHER})
+
+ #
+ # Getting OPENRTM_VERSION_MAJOR/MINOR/PATCH
+ #
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
+ OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
+ OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
+ OPENRTM_VERSION_PATCH "${OPENRTM_VERSION}")
+
+ #
+ # Getting IDL Compiler settings
+ #
+ set(OPENRTM_IDLC "")
+ set(OPENRTM_IDLFLAGS "")
+
+ execute_process(COMMAND rtm-config --idlc
+ RESULT_VARIABLE result_val
+ OUTPUT_VARIABLE output_val
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(result_val EQUAL 0)
+ set(OPENRTM_IDLC "${output_val}")
+ endif()
+
+ execute_process(COMMAND rtm-config --idlflags
+ RESULT_VARIABLE result_val
+ OUTPUT_VARIABLE output_val
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(result_val EQUAL 0)
+ string(REPLACE " " ";" output_val ${output_val})
+ set(OPENRTM_IDLFLAGS ${output_val} "-I${OPENRTM_DIR}/include/rtm/idl")
+ endif()
+
+ #
+ # Getting IDL Skelton wrapper generator settings
+ #
+ set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper")
+ set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
+
+endif(UNIX)
+
+set(WIN32_RTM "")
+set(RTM_CONFIG_CMAKE "")
+
+macro(rtm_norm_path _path _result)
+ string(REGEX REPLACE "\"" "" _var "${_path}")
+ string(REGEX REPLACE "[/]+" "/" _var "${_var}")
+ string(REGEX REPLACE "[/]$" "" _var "${_var}")
+ set(${_result} "${_var}")
+endmacro(rtm_norm_path)
+
+#------------------------------------------------------------
+# Windows
+#------------------------------------------------------------
+if(WIN32)
+ set(WIN32_RTM "10")
+ find_file(rtm_conf "rtm_config.cmake" PATHS "$ENV{RTM_ROOT}/cmake")
+ if(rtm_conf)
+ set(WIN32_RTM "11")
+ set(RTM_CONFIG_CMAKE "${rtm_conf}")
+ endif()
+endif(WIN32)
+
+if(WIN32_RTM STREQUAL "11")
+ include("${RTM_CONFIG_CMAKE}")
+ message(STATUS "Configuration by ${RTM_CONFIG_CMAKE}.")
+
+ # omniORB
+ set(OMNIORB_DIR "${omni_root}")
+ set(OMNIORB_FOUND TRUE)
+ file(TO_CMAKE_PATH "${OMNIORB_DIR}" OMNIORB_DIR)
+
+ foreach(path ${omni_includes})
+ file(TO_CMAKE_PATH "${path}" path)
+ rtm_norm_path("${path}" path)
+ list(APPEND OMNIORB_INCLUDE_DIRS "${path}")
+ endforeach()
+ foreach(path ${omni_libdir})
+ file(TO_CMAKE_PATH "${path}" path)
+ rtm_norm_path("${path}" path)
+ list(APPEND OMNIORB_LIBRARY_DIRS "${path}")
+ endforeach()
+
+ # omniORB version
+ file(GLOB _vers RELATIVE "${OMNIORB_DIR}" "${OMNIORB_DIR}/THIS_IS_OMNIORB*")
+ if("${_vers}" STREQUAL "")
+ message(FATAL_ERROR "omniORB version file not found.")
+ endif()
+
+ set(OMNIORB_VERSION "${_vers}")
+ string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
+ OMNIORB_VERSION "${OMNIORB_VERSION}")
+ string(REGEX REPLACE "[_]" "."
+ OMNIORB_VERSION "${OMNIORB_VERSION}")
+
+ set(OMNIORB_VERSION_NUM "${omni_dllver}")
+ set(OMNIORB_THREAD_NUM "${omnithread_dllver}")
+
+ set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
+ if(${OMNIORB_VERSION_NUM} MATCHES "^40")
+ set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
+ else()
+ set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
+ endif()
+
+ string(REGEX REPLACE " " ";" libs "${omni_lib}")
+ foreach(library ${libs})
+ string(REGEX REPLACE ".lib$" "" library "${library}")
+ list(APPEND OMNIORB_LIBRARIES optimized "${library}")
+ endforeach()
+ string(REGEX REPLACE " " ";" libs "${omni_libd}")
+ foreach(library ${libs})
+ string(REGEX REPLACE ".lib$" "" library "${library}")
+ list(APPEND OMNIORB_LIBRARIES debug "${library}")
+ endforeach()
+
+ # OpenRTM-aist
+ set(OPENRTM_DIR "${rtm_root}")
+ set(OPENRTM_FOUND TRUE)
+ file(TO_CMAKE_PATH "${OPENRTM_DIR}" OPENRTM_DIR)
+
+ # OpenRTM-aist version
+ set(OPENRTM_VERSION "${rtm_version}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
+ OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
+ OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
+ OPENRTM_VERSION_PATCH "${OPENRTM_VERSION}")
+
+ set(OPENRTM_VERSION_NUM "${rtm_dllver}")
+
+ foreach(path ${rtm_includes})
+ file(TO_CMAKE_PATH "${path}" path)
+ rtm_norm_path("${path}" path)
+ list(APPEND OPENRTM_INCLUDE_DIRS "${path}")
+ endforeach()
+ foreach(path ${rtm_libdir})
+ file(TO_CMAKE_PATH "${path}" path)
+ rtm_norm_path("${path}" path)
+ list(APPEND OPENRTM_LIBRARY_DIRS "${path}")
+ endforeach()
+
+ set(OPENRTM_CFLAGS "-DINCLUDE_stub_in_nt_dll")
+
+ string(REGEX REPLACE " " ";" libs "${rtm_lib}")
+ foreach(library ${libs})
+ string(REGEX REPLACE ".lib$" "" library "${library}")
+ list(APPEND OPENRTM_LIBRARIES optimized "${library}")
+ endforeach()
+ string(REGEX REPLACE " " ";" libs "${coil_lib}")
+ foreach(library ${libs})
+ string(REGEX REPLACE ".lib$" "" library "${library}")
+ list(APPEND OPENRTM_LIBRARIES optimized "${library}")
+ endforeach()
+
+ string(REGEX REPLACE " " ";" libs "${rtm_libd}")
+ foreach(library ${libs})
+ string(REGEX REPLACE ".lib$" "" library "${library}")
+ list(APPEND OPENRTM_LIBRARIES debug "${library}")
+ endforeach()
+ string(REGEX REPLACE " " ";" libs "${coil_libd}")
+ foreach(library ${libs})
+ string(REGEX REPLACE ".lib$" "" library "${library}")
+ list(APPEND OPENRTM_LIBRARIES debug "${library}")
+ endforeach()
+
+ # IDL Compiler
+ set(OPENRTM_IDLC "${rtm_idlc}")
+ string(REGEX REPLACE " " ";" flags "${rtm_idlflags}")
+ foreach(flag ${flags})
+ string(REGEX REPLACE "\\$\\(SolutionDir\\)" "${OPENRTM_DIR}" flag "${flag}")
+ string(REGEX REPLACE "[\\]" "/" flag "${flag}")
+ list(APPEND OPENRTM_IDLFLAGS "${flag}")
+ endforeach()
+
+ # IDL Skelton Wrapper
+ set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
+ set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
+
+endif(WIN32_RTM STREQUAL "11")
+
+if(WIN32_RTM STREQUAL "10")
+ # omniORB
+ if(NOT OMNIORB_DIR)
+ if(NOT $ENV{OMNI_ROOT} STREQUAL "")
+ set(OMNIORB_DIR "$ENV{OMNI_ROOT}")
+ set(OMNIORB_FOUND TRUE)
+ endif()
+ set(OMNIORB_DIR "${OMNIORB_DIR}" CACHE PATH "omniORB root directory")
+ if(NOT OMNIORB_FOUND)
+ message(FATAL_ERROR "omniORB not found.")
+ endif()
+ endif()
+
+ set(OMNIORB_INCLUDE_DIRS "${OMNIORB_DIR}/include")
+ set(OMNIORB_LIBRARY_DIRS "${OMNIORB_DIR}/lib/x86_win32")
+
+ # omniORB version
+ file(GLOB _vers RELATIVE "${OMNIORB_DIR}" "${OMNIORB_DIR}/THIS_IS_OMNIORB*")
+ if("${_vers}" STREQUAL "")
+ message(FATAL_ERROR "omniORB version file not found.")
+ endif()
+
+ set(OMNIORB_VERSION "${_vers}")
+ string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
+ OMNIORB_VERSION "${OMNIORB_VERSION}")
+ string(REGEX REPLACE "[_]" "."
+ OMNIORB_VERSION "${OMNIORB_VERSION}")
+ string(REGEX REPLACE "[.]" ""
+ OMNIORB_VERSION_NUM "${OMNIORB_VERSION}")
+
+ # omnithread version
+ file(GLOB _vers RELATIVE "${OMNIORB_LIBRARY_DIRS}" "${OMNIORB_LIBRARY_DIRS}/omnithread*")
+ if("${_vers}" STREQUAL "")
+ message(FATAL_ERROR "omnithread not found.")
+ endif()
+ string(REGEX REPLACE ".*omnithread([0-9]+)_rt\\.lib.*" "\\1"
+ OMNIORB_THREAD_NUM "${_vers}")
+
+ set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
+ if(${OMNIORB_VERSION_NUM} MATCHES "^40")
+ set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
+ else()
+ set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
+ endif()
+
+ foreach(library "omniORB${OMNIORB_VERSION_NUM}_rt"
+ "omniDynamic${OMNIORB_VERSION_NUM}_rt"
+ "omnithread${OMNIORB_THREAD_NUM}_rt")
+ list(APPEND OMNIORB_LIBRARIES optimized "${library}" debug "${library}d")
+ endforeach()
+
+ # OpenRTM-aist
+ if(NOT OPENRTM_DIR)
+ if(NOT $ENV{RTM_ROOT} STREQUAL "")
+ set(OPENRTM_DIR "$ENV{RTM_ROOT}")
+ set(OPENRTM_FOUND TRUE)
+ endif()
+ set(OPENRTM_DIR "${OPENRTM_DIR}" CACHE PATH "OpenRTM-aist root directory")
+ if(NOT OPENRTM_FOUND)
+ message(FATAL_ERROR "OpenRTM-aist not found.")
+ endif()
+ endif()
+
+ # OpenRTM-aist version
+ set(OPENRTM_VERSION "${OPENRTM_DIR}")
+ string(REGEX REPLACE ".*OpenRTM-aist/" "" OPENRTM_VERSION "${OPENRTM_VERSION}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1" OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\2" OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
+ set(OPENRTM_VERSION_PATCH "0")
+ set(OPENRTM_VERSION "${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}.${OPENRTM_VERSION_PATCH}")
+ string(REGEX REPLACE "[.]" ""
+ OPENRTM_VERSION_NUM "${OPENRTM_VERSION}")
+
+ set(OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}")
+ set(OPENRTM_LIBRARY_DIRS "${OPENRTM_DIR}/bin")
+ list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/rtm/idl")
+
+ set(OPENRTM_CFLAGS "-DINCLUDE_stub_in_nt_dll")
+
+ foreach(library "RTC${OPENRTM_VERSION_NUM}" "coil")
+ list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
+ endforeach()
+ foreach(library "ws2_32" "mswsock")
+ list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}")
+ endforeach()
+
+ # IDL Compiler
+ set(OPENRTM_IDLC "omniidl")
+ set(OPENRTM_IDLFLAGS -bcxx -Wba -nf)
+
+ # IDL Skelton Wrapper
+ set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
+ set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
+
+endif(WIN32_RTM STREQUAL "10")
+
+message(STATUS "FindOpenRTM setup done.")
+
+message(STATUS " OMNIORB_DIR=${OMNIORB_DIR}")
+message(STATUS " OMNIORB_VERSION=${OMNIORB_VERSION}")
+message(STATUS " OMNIORB_CFLAGS=${OMNIORB_CFLAGS}")
+message(STATUS " OMNIORB_INCLUDE_DIRS=${OMNIORB_INCLUDE_DIRS}")
+message(STATUS " OMNIORB_LDFLAGS=${OMNIORB_LDFLAGS}")
+message(STATUS " OMNIORB_LIBRARY_DIRS=${OMNIORB_LIBRARY_DIRS}")
+message(STATUS " OMNIORB_LIBRARIES=${OMNIORB_LIBRARIES}")
+
+message(STATUS " OPENRTM_DIR=${OPENRTM_DIR}")
+message(STATUS " OPENRTM_VERSION=${OPENRTM_VERSION}")
+message(STATUS " OPENRTM_VERSION_MAJOR=${OPENRTM_VERSION_MAJOR}")
+message(STATUS " OPENRTM_VERSION_MINOR=${OPENRTM_VERSION_MINOR}")
+message(STATUS " OPENRTM_VERSION_PATCH=${OPENRTM_VERSION_PATCH}")
+message(STATUS " OPENRTM_CFLAGS=${OPENRTM_CFLAGS}")
+message(STATUS " OPENRTM_INCLUDE_DIRS=${OPENRTM_INCLUDE_DIRS}")
+message(STATUS " OPENRTM_LDFLAGS=${OPENRTM_LDFLAGS}")
+message(STATUS " OPENRTM_LIBRARY_DIRS=${OPENRTM_LIBRARY_DIRS}")
+message(STATUS " OPENRTM_LIBRARIES=${OPENRTM_LIBRARIES}")
+
+message(STATUS " OPENRTM_IDLC=${OPENRTM_IDLC}")
+message(STATUS " OPENRTM_IDLFLAGS=${OPENRTM_IDLFLAGS}")
+message(STATUS " OPENRTM_IDL_WRAPPER=${OPENRTM_IDL_WRAPPER}")
+message(STATUS " OPENRTM_IDL_WRAPPER_FLAGS=${OPENRTM_IDL_WRAPPER_FLAGS}")
Deleted: branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org 2011-06-05 17:48:59 UTC (rev 2172)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org 2011-06-06 00:32:16 UTC (rev 2176)
@@ -1,325 +0,0 @@
-
-set(OMNIORB_FOUND FALSE)
-set(OPENRTM_FOUND FALSE)
-
-
-if(UNIX)
- include(FindPkgConfig)
-
- # omniORB
- pkg_check_modules(OMNIORB REQUIRED "omniORB4")
- if(NOT OMNIORB_DIR)
- if(OMNIORB_FOUND)
- set(OMNIORB_DIR "${OMNIORB_PREFIX}")
- endif()
- set(OMNIORB_DIR "${OMNIORB_DIR}" CACHE PATH "omniORB root directory")
- endif()
-
- set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS_OTHER})
- set(OMNIORB_LDFLAGS ${OMNIORB_LDFLAGS_OTHER})
-
- # OpenRTM-aist
- pkg_check_modules(OPENRTM REQUIRED "openrtm-aist")
- if(NOT OPENRTM_DIR)
- if(OPENRTM_FOUND)
- set(OPENRTM_DIR "${OPENRTM_PREFIX}")
- endif()
- set(OPENRTM_DIR "${OPENRTM_DIR}" CACHE PATH "OpenRTM-aist root directory")
- endif()
-
- set(OPENRTM_CFLAGS ${OPENRTM_CFLAGS_OTHER})
- set(OPENRTM_LDFLAGS ${OPENRTM_LDFLAGS_OTHER})
-
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
- OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
- OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
- OPENRTM_VERSION_PATCH "${OPENRTM_VERSION}")
-
- # IDL Compiler
- set(OPENRTM_IDLC "")
- set(OPENRTM_IDLFLAGS "")
-
- execute_process(COMMAND rtm-config --idlc
- RESULT_VARIABLE result_val
- OUTPUT_VARIABLE output_val
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(result_val EQUAL 0)
- set(OPENRTM_IDLC "${output_val}")
- endif()
-
- execute_process(COMMAND rtm-config --idlflags
- RESULT_VARIABLE result_val
- OUTPUT_VARIABLE output_val
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(result_val EQUAL 0)
- string(REPLACE " " ";" output_val ${output_val})
- set(OPENRTM_IDLFLAGS ${output_val} "-I${OPENRTM_DIR}/include/rtm/idl")
- endif()
-
- # IDL Skelton Wrapper
- set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper")
- set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
-
-endif(UNIX)
-
-set(WIN32_RTM "")
-set(RTM_CONFIG_CMAKE "")
-
-macro(rtm_norm_path _path _result)
- string(REGEX REPLACE "\"" "" _var "${_path}")
- string(REGEX REPLACE "[/]+" "/" _var "${_var}")
- string(REGEX REPLACE "[/]$" "" _var "${_var}")
- set(${_result} "${_var}")
-endmacro(rtm_norm_path)
-
-if(WIN32)
- set(WIN32_RTM "10")
- find_file(rtm_conf "rtm_config.cmake" PATHS "$ENV{RTM_ROOT}/etc")
- if(rtm_conf)
- set(WIN32_RTM "11")
- set(RTM_CONFIG_CMAKE "${rtm_conf}")
- endif()
-endif(WIN32)
-
-if(WIN32_RTM STREQUAL "11")
- include("${RTM_CONFIG_CMAKE}")
- message(STATUS "Configuration by ${RTM_CONFIG_CMAKE}.")
-
- # omniORB
- set(OMNIORB_DIR "${omni_root}")
- set(OMNIORB_FOUND TRUE)
- file(TO_CMAKE_PATH "${OMNIORB_DIR}" OMNIORB_DIR)
-
- foreach(path ${omni_includes})
- file(TO_CMAKE_PATH "${path}" path)
- rtm_norm_path("${path}" path)
- list(APPEND OMNIORB_INCLUDE_DIRS "${path}")
- endforeach()
- foreach(path ${omni_libdir})
- file(TO_CMAKE_PATH "${path}" path)
- rtm_norm_path("${path}" path)
- list(APPEND OMNIORB_LIBRARY_DIRS "${path}")
- endforeach()
-
- # omniORB version
- file(GLOB _vers RELATIVE "${OMNIORB_DIR}" "${OMNIORB_DIR}/THIS_IS_OMNIORB*")
- if("${_vers}" STREQUAL "")
- message(FATAL_ERROR "omniORB version file not found.")
- endif()
-
- set(OMNIORB_VERSION "${_vers}")
- string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
- OMNIORB_VERSION "${OMNIORB_VERSION}")
- string(REGEX REPLACE "[_]" "."
- OMNIORB_VERSION "${OMNIORB_VERSION}")
-
- set(OMNIORB_VERSION_NUM "${omni_dllver}")
- set(OMNIORB_THREAD_NUM "${omnithread_dllver}")
-
- set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
- if(${OMNIORB_VERSION_NUM} MATCHES "^40")
- set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
- else()
- set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
- endif()
-
- string(REGEX REPLACE " " ";" libs "${omni_lib}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
- list(APPEND OMNIORB_LIBRARIES optimized "${library}")
- endforeach()
- string(REGEX REPLACE " " ";" libs "${omni_libd}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
- list(APPEND OMNIORB_LIBRARIES debug "${library}")
- endforeach()
-
- # OpenRTM-aist
- set(OPENRTM_DIR "${rtm_root}")
- set(OPENRTM_FOUND TRUE)
- file(TO_CMAKE_PATH "${OPENRTM_DIR}" OPENRTM_DIR)
-
- # OpenRTM-aist version
- set(OPENRTM_VERSION "${rtm_version}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
- OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
- OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
- OPENRTM_VERSION_PATCH "${OPENRTM_VERSION}")
-
- set(OPENRTM_VERSION_NUM "${rtm_dllver}")
-
- foreach(path ${rtm_includes})
- file(TO_CMAKE_PATH "${path}" path)
- rtm_norm_path("${path}" path)
- list(APPEND OPENRTM_INCLUDE_DIRS "${path}")
- endforeach()
- foreach(path ${rtm_libdir})
- file(TO_CMAKE_PATH "${path}" path)
- rtm_norm_path("${path}" path)
- list(APPEND OPENRTM_LIBRARY_DIRS "${path}")
- endforeach()
-
- set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
-
- string(REGEX REPLACE " " ";" libs "${rtm_lib}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
- list(APPEND OPENRTM_LIBRARIES optimized "${library}")
- endforeach()
- string(REGEX REPLACE " " ";" libs "${coil_lib}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
- list(APPEND OPENRTM_LIBRARIES optimized "${library}")
- endforeach()
-
- string(REGEX REPLACE " " ";" libs "${rtm_libd}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
- list(APPEND OPENRTM_LIBRARIES debug "${library}")
- endforeach()
- string(REGEX REPLACE " " ";" libs "${coil_libd}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
- list(APPEND OPENRTM_LIBRARIES debug "${library}")
- endforeach()
-
- # IDL Compiler
- set(OPENRTM_IDLC "${rtm_idlc}")
- string(REGEX REPLACE " " ";" flags "${rtm_idlflags}")
- foreach(flag ${flags})
- string(REGEX REPLACE "\\$\\(SolutionDir\\)" "${OPENRTM_DIR}" flag "${flag}")
- string(REGEX REPLACE "[\\]" "/" flag "${flag}")
- list(APPEND OPENRTM_IDLFLAGS "${flag}")
- endforeach()
-
- # IDL Skelton Wrapper
- set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
- set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
-
-endif(WIN32_RTM STREQUAL "11")
-
-if(WIN32_RTM STREQUAL "10")
- # omniORB
- if(NOT OMNIORB_DIR)
- if(NOT $ENV{OMNI_ROOT} STREQUAL "")
- set(OMNIORB_DIR "$ENV{OMNI_ROOT}")
- set(OMNIORB_FOUND TRUE)
- endif()
- set(OMNIORB_DIR "${OMNIORB_DIR}" CACHE PATH "omniORB root directory")
- if(NOT OMNIORB_FOUND)
- message(FATAL_ERROR "omniORB not found.")
- endif()
- endif()
-
- set(OMNIORB_INCLUDE_DIRS "${OMNIORB_DIR}/include")
- set(OMNIORB_LIBRARY_DIRS "${OMNIORB_DIR}/lib/x86_win32")
-
- # omniORB version
- file(GLOB _vers RELATIVE "${OMNIORB_DIR}" "${OMNIORB_DIR}/THIS_IS_OMNIORB*")
- if("${_vers}" STREQUAL "")
- message(FATAL_ERROR "omniORB version file not found.")
- endif()
-
- set(OMNIORB_VERSION "${_vers}")
- string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
- OMNIORB_VERSION "${OMNIORB_VERSION}")
- string(REGEX REPLACE "[_]" "."
- OMNIORB_VERSION "${OMNIORB_VERSION}")
- string(REGEX REPLACE "[.]" ""
- OMNIORB_VERSION_NUM "${OMNIORB_VERSION}")
-
- # omnithread version
- file(GLOB _vers RELATIVE "${OMNIORB_LIBRARY_DIRS}" "${OMNIORB_LIBRARY_DIRS}/omnithread*")
- if("${_vers}" STREQUAL "")
- message(FATAL_ERROR "omnithread not found.")
- endif()
- string(REGEX REPLACE ".*omnithread([0-9]+)_rt\\.lib.*" "\\1"
- OMNIORB_THREAD_NUM "${_vers}")
-
- set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
- if(${OMNIORB_VERSION_NUM} MATCHES "^40")
- set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
- else()
- set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
- endif()
-
- foreach(library "omniORB${OMNIORB_VERSION_NUM}_rt"
- "omniDynamic${OMNIORB_VERSION_NUM}_rt"
- "omnithread${OMNIORB_THREAD_NUM}_rt")
- list(APPEND OMNIORB_LIBRARIES optimized "${library}" debug "${library}d")
- endforeach()
-
- # OpenRTM-aist
- if(NOT OPENRTM_DIR)
- if(NOT $ENV{RTM_ROOT} STREQUAL "")
- set(OPENRTM_DIR "$ENV{RTM_ROOT}")
- set(OPENRTM_FOUND TRUE)
- endif()
- set(OPENRTM_DIR "${OPENRTM_DIR}" CACHE PATH "OpenRTM-aist root directory")
- if(NOT OPENRTM_FOUND)
- message(FATAL_ERROR "OpenRTM-aist not found.")
- endif()
- endif()
-
- # OpenRTM-aist version
- set(OPENRTM_VERSION "${OPENRTM_DIR}")
- string(REGEX REPLACE ".*OpenRTM-aist/" "" OPENRTM_VERSION "${OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1" OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\2" OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
- set(OPENRTM_VERSION_PATCH "0")
- set(OPENRTM_VERSION "${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}.${OPENRTM_VERSION_PATCH}")
- string(REGEX REPLACE "[.]" ""
- OPENRTM_VERSION_NUM "${OPENRTM_VERSION}")
-
- set(OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}")
- set(OPENRTM_LIBRARY_DIRS "${OPENRTM_DIR}/bin")
- list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/rtm/idl")
-
- set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
-
- foreach(library "RTC${OPENRTM_VERSION_NUM}" "coil")
- list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
- endforeach()
- foreach(library "ws2_32" "mswsock")
- list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}")
- endforeach()
-
- # IDL Compiler
- set(OPENRTM_IDLC "omniidl")
- set(OPENRTM_IDLFLAGS -bcxx -Wba -nf)
-
- # IDL Skelton Wrapper
- set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
- set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
-
-endif(WIN32)
-
-message(STATUS "FindOpenRTM setup done.")
-
-message(STATUS " OMNIORB_DIR=${OMNIORB_DIR}")
-message(STATUS " OMNIORB_VERSION=${OMNIORB_VERSION}")
-message(STATUS " OMNIORB_CFLAGS=${OMNIORB_CFLAGS}")
-message(STATUS " OMNIORB_INCLUDE_DIRS=${OMNIORB_INCLUDE_DIRS}")
-message(STATUS " OMNIORB_LDFLAGS=${OMNIORB_LDFLAGS}")
-message(STATUS " OMNIORB_LIBRARY_DIRS=${OMNIORB_LIBRARY_DIRS}")
-message(STATUS " OMNIORB_LIBRARIES=${OMNIORB_LIBRARIES}")
-
-message(STATUS " OPENRTM_DIR=${OPENRTM_DIR}")
-message(STATUS " OPENRTM_VERSION=${OPENRTM_VERSION}")
-message(STATUS " OPENRTM_VERSION_MAJOR=${OPENRTM_VERSION_MAJOR}")
-message(STATUS " OPENRTM_VERSION_MINOR=${OPENRTM_VERSION_MINOR}")
-message(STATUS " OPENRTM_VERSION_PATCH=${OPENRTM_VERSION_PATCH}")
-message(STATUS " OPENRTM_CFLAGS=${OPENRTM_CFLAGS}")
-message(STATUS " OPENRTM_INCLUDE_DIRS=${OPENRTM_INCLUDE_DIRS}")
-message(STATUS " OPENRTM_LDFLAGS=${OPENRTM_LDFLAGS}")
-message(STATUS " OPENRTM_LIBRARY_DIRS=${OPENRTM_LIBRARY_DIRS}")
-message(STATUS " OPENRTM_LIBRARIES=${OPENRTM_LIBRARIES}")
-
-message(STATUS " OPENRTM_IDLC=${OPENRTM_IDLC}")
-message(STATUS " OPENRTM_IDLFLAGS=${OPENRTM_IDLFLAGS}")
-message(STATUS " OPENRTM_IDL_WRAPPER=${OPENRTM_IDL_WRAPPER}")
-message(STATUS " OPENRTM_IDL_WRAPPER_FLAGS=${OPENRTM_IDL_WRAPPER_FLAGS}")
Copied: branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org (from rev 2172, trunk/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org 2011-06-06 00:32:16 UTC (rev 2176)
@@ -0,0 +1,325 @@
+
+set(OMNIORB_FOUND FALSE)
+set(OPENRTM_FOUND FALSE)
+
+
+if(UNIX)
+ include(FindPkgConfig)
+
+ # omniORB
+ pkg_check_modules(OMNIORB REQUIRED "omniORB4")
+ if(NOT OMNIORB_DIR)
+ if(OMNIORB_FOUND)
+ set(OMNIORB_DIR "${OMNIORB_PREFIX}")
+ endif()
+ set(OMNIORB_DIR "${OMNIORB_DIR}" CACHE PATH "omniORB root directory")
+ endif()
+
+ set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS_OTHER})
+ set(OMNIORB_LDFLAGS ${OMNIORB_LDFLAGS_OTHER})
+
+ # OpenRTM-aist
+ pkg_check_modules(OPENRTM REQUIRED "openrtm-aist")
+ if(NOT OPENRTM_DIR)
+ if(OPENRTM_FOUND)
+ set(OPENRTM_DIR "${OPENRTM_PREFIX}")
+ endif()
+ set(OPENRTM_DIR "${OPENRTM_DIR}" CACHE PATH "OpenRTM-aist root directory")
+ endif()
+
+ set(OPENRTM_CFLAGS ${OPENRTM_CFLAGS_OTHER})
+ set(OPENRTM_LDFLAGS ${OPENRTM_LDFLAGS_OTHER})
+
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
+ OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
+ OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
+ OPENRTM_VERSION_PATCH "${OPENRTM_VERSION}")
+
+ # IDL Compiler
+ set(OPENRTM_IDLC "")
+ set(OPENRTM_IDLFLAGS "")
+
+ execute_process(COMMAND rtm-config --idlc
+ RESULT_VARIABLE result_val
+ OUTPUT_VARIABLE output_val
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(result_val EQUAL 0)
+ set(OPENRTM_IDLC "${output_val}")
+ endif()
+
+ execute_process(COMMAND rtm-config --idlflags
+ RESULT_VARIABLE result_val
+ OUTPUT_VARIABLE output_val
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(result_val EQUAL 0)
+ string(REPLACE " " ";" output_val ${output_val})
+ set(OPENRTM_IDLFLAGS ${output_val} "-I${OPENRTM_DIR}/include/rtm/idl")
+ endif()
+
+ # IDL Skelton Wrapper
+ set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper")
+ set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
+
+endif(UNIX)
+
+set(WIN32_RTM "")
+set(RTM_CONFIG_CMAKE "")
+
+macro(rtm_norm_path _path _result)
+ string(REGEX REPLACE "\"" "" _var "${_path}")
+ string(REGEX REPLACE "[/]+" "/" _var "${_var}")
+ string(REGEX REPLACE "[/]$" "" _var "${_var}")
+ set(${_result} "${_var}")
+endmacro(rtm_norm_path)
+
+if(WIN32)
+ set(WIN32_RTM "10")
+ find_file(rtm_conf "rtm_config.cmake" PATHS "$ENV{RTM_ROOT}/etc")
+ if(rtm_conf)
+ set(WIN32_RTM "11")
+ set(RTM_CONFIG_CMAKE "${rtm_conf}")
+ endif()
+endif(WIN32)
+
+if(WIN32_RTM STREQUAL "11")
+ include("${RTM_CONFIG_CMAKE}")
+ message(STATUS "Configuration by ${RTM_CONFIG_CMAKE}.")
+
+ # omniORB
+ set(OMNIORB_DIR "${omni_root}")
+ set(OMNIORB_FOUND TRUE)
+ file(TO_CMAKE_PATH "${OMNIORB_DIR}" OMNIORB_DIR)
+
+ foreach(path ${omni_includes})
+ file(TO_CMAKE_PATH "${path}" path)
+ rtm_norm_path("${path}" path)
+ list(APPEND OMNIORB_INCLUDE_DIRS "${path}")
+ endforeach()
+ foreach(path ${omni_libdir})
+ file(TO_CMAKE_PATH "${path}" path)
+ rtm_norm_path("${path}" path)
+ list(APPEND OMNIORB_LIBRARY_DIRS "${path}")
+ endforeach()
+
+ # omniORB version
+ file(GLOB _vers RELATIVE "${OMNIORB_DIR}" "${OMNIORB_DIR}/THIS_IS_OMNIORB*")
+ if("${_vers}" STREQUAL "")
+ message(FATAL_ERROR "omniORB version file not found.")
+ endif()
+
+ set(OMNIORB_VERSION "${_vers}")
+ string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
+ OMNIORB_VERSION "${OMNIORB_VERSION}")
+ string(REGEX REPLACE "[_]" "."
+ OMNIORB_VERSION "${OMNIORB_VERSION}")
+
+ set(OMNIORB_VERSION_NUM "${omni_dllver}")
+ set(OMNIORB_THREAD_NUM "${omnithread_dllver}")
+
+ set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
+ if(${OMNIORB_VERSION_NUM} MATCHES "^40")
+ set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
+ else()
+ set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
+ endif()
+
+ string(REGEX REPLACE " " ";" libs "${omni_lib}")
+ foreach(library ${libs})
+ string(REGEX REPLACE ".lib$" "" library "${library}")
+ list(APPEND OMNIORB_LIBRARIES optimized "${library}")
+ endforeach()
+ string(REGEX REPLACE " " ";" libs "${omni_libd}")
+ foreach(library ${libs})
+ string(REGEX REPLACE ".lib$" "" library "${library}")
+ list(APPEND OMNIORB_LIBRARIES debug "${library}")
+ endforeach()
+
+ # OpenRTM-aist
+ set(OPENRTM_DIR "${rtm_root}")
+ set(OPENRTM_FOUND TRUE)
+ file(TO_CMAKE_PATH "${OPENRTM_DIR}" OPENRTM_DIR)
+
+ # OpenRTM-aist version
+ set(OPENRTM_VERSION "${rtm_version}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
+ OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
+ OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
+ OPENRTM_VERSION_PATCH "${OPENRTM_VERSION}")
+
+ set(OPENRTM_VERSION_NUM "${rtm_dllver}")
+
+ foreach(path ${rtm_includes})
+ file(TO_CMAKE_PATH "${path}" path)
+ rtm_norm_path("${path}" path)
+ list(APPEND OPENRTM_INCLUDE_DIRS "${path}")
+ endforeach()
+ foreach(path ${rtm_libdir})
+ file(TO_CMAKE_PATH "${path}" path)
+ rtm_norm_path("${path}" path)
+ list(APPEND OPENRTM_LIBRARY_DIRS "${path}")
+ endforeach()
+
+ set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
+
+ string(REGEX REPLACE " " ";" libs "${rtm_lib}")
+ foreach(library ${libs})
+ string(REGEX REPLACE ".lib$" "" library "${library}")
+ list(APPEND OPENRTM_LIBRARIES optimized "${library}")
+ endforeach()
+ string(REGEX REPLACE " " ";" libs "${coil_lib}")
+ foreach(library ${libs})
+ string(REGEX REPLACE ".lib$" "" library "${library}")
+ list(APPEND OPENRTM_LIBRARIES optimized "${library}")
+ endforeach()
+
+ string(REGEX REPLACE " " ";" libs "${rtm_libd}")
+ foreach(library ${libs})
+ string(REGEX REPLACE ".lib$" "" library "${library}")
+ list(APPEND OPENRTM_LIBRARIES debug "${library}")
+ endforeach()
+ string(REGEX REPLACE " " ";" libs "${coil_libd}")
+ foreach(library ${libs})
+ string(REGEX REPLACE ".lib$" "" library "${library}")
+ list(APPEND OPENRTM_LIBRARIES debug "${library}")
+ endforeach()
+
+ # IDL Compiler
+ set(OPENRTM_IDLC "${rtm_idlc}")
+ string(REGEX REPLACE " " ";" flags "${rtm_idlflags}")
+ foreach(flag ${flags})
+ string(REGEX REPLACE "\\$\\(SolutionDir\\)" "${OPENRTM_DIR}" flag "${flag}")
+ string(REGEX REPLACE "[\\]" "/" flag "${flag}")
+ list(APPEND OPENRTM_IDLFLAGS "${flag}")
+ endforeach()
+
+ # IDL Skelton Wrapper
+ set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
+ set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
+
+endif(WIN32_RTM STREQUAL "11")
+
+if(WIN32_RTM STREQUAL "10")
+ # omniORB
+ if(NOT OMNIORB_DIR)
+ if(NOT $ENV{OMNI_ROOT} STREQUAL "")
+ set(OMNIORB_DIR "$ENV{OMNI_ROOT}")
+ set(OMNIORB_FOUND TRUE)
+ endif()
+ set(OMNIORB_DIR "${OMNIORB_DIR}" CACHE PATH "omniORB root directory")
+ if(NOT OMNIORB_FOUND)
+ message(FATAL_ERROR "omniORB not found.")
+ endif()
+ endif()
+
+ set(OMNIORB_INCLUDE_DIRS "${OMNIORB_DIR}/include")
+ set(OMNIORB_LIBRARY_DIRS "${OMNIORB_DIR}/lib/x86_win32")
+
+ # omniORB version
+ file(GLOB _vers RELATIVE "${OMNIORB_DIR}" "${OMNIORB_DIR}/THIS_IS_OMNIORB*")
+ if("${_vers}" STREQUAL "")
+ message(FATAL_ERROR "omniORB version file not found.")
+ endif()
+
+ set(OMNIORB_VERSION "${_vers}")
+ string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
+ OMNIORB_VERSION "${OMNIORB_VERSION}")
+ string(REGEX REPLACE "[_]" "."
+ OMNIORB_VERSION "${OMNIORB_VERSION}")
+ string(REGEX REPLACE "[.]" ""
+ OMNIORB_VERSION_NUM "${OMNIORB_VERSION}")
+
+ # omnithread version
+ file(GLOB _vers RELATIVE "${OMNIORB_LIBRARY_DIRS}" "${OMNIORB_LIBRARY_DIRS}/omnithread*")
+ if("${_vers}" STREQUAL "")
+ message(FATAL_ERROR "omnithread not found.")
+ endif()
+ string(REGEX REPLACE ".*omnithread([0-9]+)_rt\\.lib.*" "\\1"
+ OMNIORB_THREAD_NUM "${_vers}")
+
+ set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
+ if(${OMNIORB_VERSION_NUM} MATCHES "^40")
+ set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
+ else()
+ set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
+ endif()
+
+ foreach(library "omniORB${OMNIORB_VERSION_NUM}_rt"
+ "omniDynamic${OMNIORB_VERSION_NUM}_rt"
+ "omnithread${OMNIORB_THREAD_NUM}_rt")
+ list(APPEND OMNIORB_LIBRARIES optimized "${library}" debug "${library}d")
+ endforeach()
+
+ # OpenRTM-aist
+ if(NOT OPENRTM_DIR)
+ if(NOT $ENV{RTM_ROOT} STREQUAL "")
+ set(OPENRTM_DIR "$ENV{RTM_ROOT}")
+ set(OPENRTM_FOUND TRUE)
+ endif()
+ set(OPENRTM_DIR "${OPENRTM_DIR}" CACHE PATH "OpenRTM-aist root directory")
+ if(NOT OPENRTM_FOUND)
+ message(FATAL_ERROR "OpenRTM-aist not found.")
+ endif()
+ endif()
+
+ # OpenRTM-aist version
+ set(OPENRTM_VERSION "${OPENRTM_DIR}")
+ string(REGEX REPLACE ".*OpenRTM-aist/" "" OPENRTM_VERSION "${OPENRTM_VERSION}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1" OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
+ string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\2" OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
+ set(OPENRTM_VERSION_PATCH "0")
+ set(OPENRTM_VERSION "${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}.${OPENRTM_VERSION_PATCH}")
+ string(REGEX REPLACE "[.]" ""
+ OPENRTM_VERSION_NUM "${OPENRTM_VERSION}")
+
+ set(OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}")
+ set(OPENRTM_LIBRARY_DIRS "${OPENRTM_DIR}/bin")
+ list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/rtm/idl")
+
+ set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
+
+ foreach(library "RTC${OPENRTM_VERSION_NUM}" "coil")
+ list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
+ endforeach()
+ foreach(library "ws2_32" "mswsock")
+ list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}")
+ endforeach()
+
+ # IDL Compiler
+ set(OPENRTM_IDLC "omniidl")
+ set(OPENRTM_IDLFLAGS -bcxx -Wba -nf)
+
+ # IDL Skelton Wrapper
+ set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
+ set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
+
+endif(WIN32)
+
+message(STATUS "FindOpenRTM setup done.")
+
+message(STATUS " OMNIORB_DIR=${OMNIORB_DIR}")
+message(STATUS " OMNIORB_VERSION=${OMNIORB_VERSION}")
+message(STATUS " OMNIORB_CFLAGS=${OMNIORB_CFLAGS}")
+message(STATUS " OMNIORB_INCLUDE_DIRS=${OMNIORB_INCLUDE_DIRS}")
+message(STATUS " OMNIORB_LDFLAGS=${OMNIORB_LDFLAGS}")
+message(STATUS " OMNIORB_LIBRARY_DIRS=${OMNIORB_LIBRARY_DIRS}")
+message(STATUS " OMNIORB_LIBRARIES=${OMNIORB_LIBRARIES}")
+
+message(STATUS " OPENRTM_DIR=${OPENRTM_DIR}")
+message(STATUS " OPENRTM_VERSION=${OPENRTM_VERSION}")
+message(STATUS " OPENRTM_VERSION_MAJOR=${OPENRTM_VERSION_MAJOR}")
+message(STATUS " OPENRTM_VERSION_MINOR=${OPENRTM_VERSION_MINOR}")
+message(STATUS " OPENRTM_VERSION_PATCH=${OPENRTM_VERSION_PATCH}")
+message(STATUS " OPENRTM_CFLAGS=${OPENRTM_CFLAGS}")
+message(STATUS " OPENRTM_INCLUDE_DIRS=${OPENRTM_INCLUDE_DIRS}")
+message(STATUS " OPENRTM_LDFLAGS=${OPENRTM_LDFLAGS}")
+message(STATUS " OPENRTM_LIBRARY_DIRS=${OPENRTM_LIBRARY_DIRS}")
+message(STATUS " OPENRTM_LIBRARIES=${OPENRTM_LIBRARIES}")
+
+message(STATUS " OPENRTM_IDLC=${OPENRTM_IDLC}")
+message(STATUS " OPENRTM_IDLFLAGS=${OPENRTM_IDLFLAGS}")
+message(STATUS " OPENRTM_IDL_WRAPPER=${OPENRTM_IDL_WRAPPER}")
+message(STATUS " OPENRTM_IDL_WRAPPER_FLAGS=${OPENRTM_IDL_WRAPPER_FLAGS}")
Deleted: branches/RELENG_1_1/OpenRTM-aist/utils/cmake/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/Makefile.am 2011-06-05 17:48:59 UTC (rev 2172)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/cmake/Makefile.am 2011-06-06 00:32:16 UTC (rev 2176)
@@ -1,190 +0,0 @@
-## -*- Makefile -*-
-##---------------------------------------------------------------------------
-## Makefile for cmake: creating OpenRTM-aist's FindOpenRTM.cmake for cmake
-##
-## $Id$
-##---------------------------------------------------------------------------
-#
-# CMake's OpenRTMFind.cmake installation diretories
-#
-# * for the Windows systems
-# <prefix>/ (W)
-# <prefix>/(cmake|CMake)/ (W)
-# <prefix>/<name>*/ (W)
-# <prefix>/<name>*/(cmake|CMake)/ (W)
-#
-# * for the UNIX systems
-# <prefix>/(share|lib)/cmake/<name>*/ (U)
-# <prefix>/(share|lib)/<name>*/ (U)
-# <prefix>/(share|lib)/<name>*/(cmake|CMake)/ (U)
-#
-# In Mac OS X with MacPorts, <prefix> might be /opt/local. (not confirmed)
-# And on systems supporting OS X Frameworks and Application Bundles
-# the following directories are searched for frameworks or bundles
-# containing a configuration file:
-#
-# * for Mac OS X with frameworks and Application Bundles
-# <prefix>/<name>.framework/Resources/ (A)
-# <prefix>/<name>.framework/Resources/CMake/ (A)
-# <prefix>/<name>.framework/Versions/*/Resources/ (A)
-# <prefix>/<name>.framework/Versions/*/Resources/CMake/ (A)
-# <prefix>/<name>.app/Contents/Resources/ (A)
-# <prefix>/<name>.app/Contents/Resources/CMake/ (A)
-#
-# for the OpenRTM-aist
-#
-# Windows:
-# <prefix>/<name>*/cmake: C:/Progam Files/OpenRTM-aist/1.1/cmake
-# UNIX:
-# <prefix>/lib/<name>*/cmake: /usr/lib/openrtm-1.1/cmake
-# Mac OS X
-# <prefix>/lib/<name>*/cmake: /opt/local/lib/openrtm-1.1/cmake
-#
-# Users' CMakeList.txt just only use the following find_package() command
-# find_package(OpenRTM-aist ....)
-# ^^^^^^^^^^^^ cmake handle <name> case-insensitively
-#
-#
-#
-# testing find_package ability
-#
-# Windows)
-# configfile: C:\Program Files\OpenRTM-aist\1.1\cmake\
-# directives:
-# find_package(OpenRTM CONFIGS OpenRTMConfig.cmake): OK
-# find_package(openrtm CONFIGS OpenRTMConfig.cmake): OK
-# find_package(OpenRTM-aist CONFIGS OpenRTMConfig.cmake): OK
-# find_package(openrtm-aist CONFIGS OpenRTMConfig.cmake): OK
-#
-# UNIX)
-# configfile: /usr/lib/openrtm-1.1/cmake/OpenRTMConfig.cmake
-# directives:
-# find_package(openrtm CONFIGS OpenRTMConfig.cmake): OK
-# find_package(OpenRTM CONFIGS OpenRTMConfig.cmake): OK
-# find_package(OpenRTM-aist CONFIGS OpenRTMConfig.cmake): NG
-# find_package(openrtm-aist CONFIGS OpenRTMConfig.cmake): NG
-# find_package(OpenRTM-aist CONFIGS OpenRTMConfig.cmake NAMES openrtm): OK
-# find_package(openrtm-aist CONFIGS OpenRTMConfig.cmake NAMES openrtm): OK
-#
-
-AUTOMAKE_OPTIONS = 1.4
-
-ORB = @ORB@
-IDLC = @IDLC@
-IDLFLAGS = @IDL_FLAGS@
-
-cmakedir = ${rtm_libdir}/cmake
-cmake_DATA = OpenRTMConfig.cmake FindOpenRTM.cmake
-
-# basic compiler/linker options
-OPENRTM_CFLAGS=`echo "${CXXFLAGS}" | sed -e 's/\-I[^ ]*//g'`
-OPENRTM_INCLUDE_DIRS= \
- -I${prefix}/include \
- -I${coil_includedir} \
- -I${rtm_includedir} \
- -I${rtm_includedir}/rtm/idl
-OPENRTM_LDFLAGS_=`echo "${LDFLAGS}" | sed -e 's/\-L[^ ]*//g'`
-OPENRTM_LIBRARY_DIRS=-L${prefix}/lib
-OPENRTM_LIBRARIES_=${LIBS} -lRTC -lcoil
-
-# OpenRTM-aist specific directory
-COIL_INCLUDE_DIR=${coil_includedir}
-OPENRTM_INCLUDE_DIR=${rtm_includedir}
-OPENRTM_LIB_DIR=${rtm_libdir}
-OPENRTM_DATA_DIR=${rtm_datadir}
-
-# OpenRTM-aist version
-OPENRTM_VERSION=${RTM_VERSION}
-OPENRTM_VERSION_MAJOR=${RTM_MAJOR_VERSION}
-OPENRTM_VERSION_MINOR=${RTM_MINOR_VERSION}
-OPENRTM_REVISION_NUM=${RTM_REVISION_NUM}
-OPENRTM_SHORT_VERSION=${RTM_SHORT_VERSION}
-
-# OpenRTM-aist's CORBA related settings
-OPENRTM_ORB=${ORB}
-OPENRTM_IDL_WRAPPER=rtm-skelwrapper
-OPENRTM_IDL_WRAPPER_FLAGS=--include-dir="" --skel-suffix=Skel --stub-suffix=Stub
-OPENRTM_IDLC=${IDLC}
-OPENRTM_IDLFLAGS=${IDLFLAGS}
-
-
-OpenRTMConfig.cmake: Makefile.am
- echo "# -*- cmake -*-" > $@
- echo "#" >> $@
- echo "# @file OpenRTMConfig.cmake" >> $@
- echo "# @brief cmake-config file for OpenRTM-aist" >> $@
- echo "# @author Noriaki Ando" >> $@
- echo "# @date "`date` >> $@
- echo "#" >> $@
- echo "# This file is used for cmake config-mode." >> $@
- echo "# The following variables are defined." >> $@
- echo "#" >> $@
- echo "# Basic compiler/linker options" >> $@
- echo "# - OPENRTM_CFLAGS: cflags " >> $@
- echo "# - OPENRTM_INCLUDE_DIRS: include directories" >> $@
- echo "# - OPENRTM_LDFLAGS: linker options" >> $@
- echo "# - OPENRTM_LIBRARY_DIRS: library directories" >> $@
- echo "# - OPENRTM_LIBRARIES: libraries" >> $@
- echo "# - OPENRTM_LIB_DIR: OpenRTM's lib directory" >> $@
- echo "#" >> $@
- echo "# OpenRTM-aist specific directory" >> $@
- echo "# - COIL_INCLUDE_DIR: coil include dir" >> $@
- echo "# - OPENRTM_INCLUDE_DIR: OpenRTM's include directory" >> $@
- echo "# - OPENRTM_LIB_DIR: OpenRTM's lib directory" >> $@
- echo "# - OPENRTM_DATA_DIR: OpenRTM's shared directory" >> $@
- echo "#" >> $@
- echo "# OpenRTM-aist version" >> $@
- echo "# - OPENRTM_VERSION: x.y.z version" >> $@
- echo "# - OPENRTM_VERSION_MAJOR: major version number" >> $@
- echo "# - OPENRTM_VERSION_MINOR: minor version number" >> $@
- echo "# - OPENRTM_VERSION_PATCH: revision number" >> $@
- echo "# - OPENRTM_SHORT_VERSION: short version number 1.1.0->110" >> $@
- echo "#" >> $@
- echo "# OpenRTM-aist's CORBA related settings" >> $@
- echo "# - OPENRTM_ORB: CORBA implementation" >> $@
- echo "# - OPENRTM_IDL_WRAPPER: rtm-skelwrapper command" >> $@
- echo "# - OPENRTM_IDL_WRAPPER_FLAGS: rtm-skelwrapper flag" >> $@
- echo "# - OPENRTM_IDLC: IDL command" >> $@
- echo "# - OPENRTM_IDLFLAGS: IDL optins" >> $@
- echo "" >> $@
- echo 'message(STATUS "OpenRTMConfig.cmake found.")' >> $@
- echo 'message(STATUS "Configrued by configuration mode.")' >> $@
- echo "" >> $@
- echo "" >> $@
- echo "# Basic compiler/linker options" >> $@
- echo "set(OPENRTM_CFLAGS ${OPENRTM_CFLAGS})" >> $@
- echo "set(OPENRTM_INCLUDE_DIRS ${OPENRTM_INCLUDE_DIRS})" >> $@
- echo "set(OPENRTM_LDFLAGS ${OPENRTM_LDFLAGS_})" >> $@
- echo "set(OPENRTM_LIBRARY_DIRS ${OPENRTM_LIBRARY_DIRS})" >> $@
- echo "set(OPENRTM_LIBRARIES ${OPENRTM_LIBRARIES_})" >> $@
- echo "set(OPENRTM_LIB_DIR ${OPENRTM_LIB_DIR})" >> $@
- echo "" >> $@
- echo "# OpenRTM-aist specific directory" >> $@
- echo "set(COIL_INCLUDE_DIR ${COIL_INCLUDE_DIR})" >> $@
- echo "set(OPENRTM_INCLUDE_DIR ${OPENRTM_INCLUDE_DIR})" >> $@
- echo "set(OPENRTM_LIB_DIR ${OPENRTM_LIB_DIR})" >> $@
- echo "set(OPENRTM_DATA_DIR ${OPENRTM_DATA_DIR})" >> $@
- echo "" >> $@
- echo "# OpenRTM-aist version" >> $@
- echo "set(OPENRTM_VERSION ${OPENRTM_VERSION})" >> $@
- echo "set(OPENRTM_VERSION_MAJOR ${OPENRTM_VERSION_MAJOR})" >> $@
- echo "set(OPENRTM_VERSION_MINOR ${OPENRTM_VERSION_MINOR})" >> $@
- echo "set(OPENRTM_VERSION_PATCH ${OPENRTM_REVISION_NUM})" >> $@
- echo "set(OPENRTM_SHORT_VERSION ${OPENRTM_SHORT_VERSION})" >> $@
- echo "" >> $@
- echo "# OpenRTM-aist's CORBA related settings" >> $@
- echo "set(OPENRTM_ORB ${OPENRTM_ORB})" >> $@
- echo "set(OPENRTM_IDL_WRAPPER ${OPENRTM_IDL_WRAPPER})" >> $@
- echo "set(OPENRTM_IDL_WRAPPER_FLAGS ${OPENRTM_IDL_WRAPPER_FLAGS})" >> $@
- echo "set(OPENRTM_IDLC ${OPENRTM_IDLC})" >> $@
- echo "set(OPENRTM_IDLFLAGS ${OPENRTM_IDLFLAGS})" >> $@
- echo "" >> $@
- echo 'message(STATUS "OpenRTM-aist configuration done")' >> $@
- echo "# end of OpenRTMConfig.cmake" >> $@
-
-
-EXTRA_DIST = FindOpenRTM.cmake
-
-clean-local:
- rm -f OpenRTMConfig.cmake
- rm -rf *~
Copied: branches/RELENG_1_1/OpenRTM-aist/utils/cmake/Makefile.am (from rev 2172, trunk/OpenRTM-aist/utils/cmake/Makefile.am)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/cmake/Makefile.am (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/cmake/Makefile.am 2011-06-06 00:32:16 UTC (rev 2176)
@@ -0,0 +1,190 @@
+## -*- Makefile -*-
+##---------------------------------------------------------------------------
+## Makefile for cmake: creating OpenRTM-aist's FindOpenRTM.cmake for cmake
+##
+## $Id$
+##---------------------------------------------------------------------------
+#
+# CMake's OpenRTMFind.cmake installation diretories
+#
+# * for the Windows systems
+# <prefix>/ (W)
+# <prefix>/(cmake|CMake)/ (W)
+# <prefix>/<name>*/ (W)
+# <prefix>/<name>*/(cmake|CMake)/ (W)
+#
+# * for the UNIX systems
+# <prefix>/(share|lib)/cmake/<name>*/ (U)
+# <prefix>/(share|lib)/<name>*/ (U)
+# <prefix>/(share|lib)/<name>*/(cmake|CMake)/ (U)
+#
+# In Mac OS X with MacPorts, <prefix> might be /opt/local. (not confirmed)
+# And on systems supporting OS X Frameworks and Application Bundles
+# the following directories are searched for frameworks or bundles
+# containing a configuration file:
+#
+# * for Mac OS X with frameworks and Application Bundles
+# <prefix>/<name>.framework/Resources/ (A)
+# <prefix>/<name>.framework/Resources/CMake/ (A)
+# <prefix>/<name>.framework/Versions/*/Resources/ (A)
+# <prefix>/<name>.framework/Versions/*/Resources/CMake/ (A)
+# <prefix>/<name>.app/Contents/Resources/ (A)
+# <prefix>/<name>.app/Contents/Resources/CMake/ (A)
+#
+# for the OpenRTM-aist
+#
+# Windows:
+# <prefix>/<name>*/cmake: C:/Progam Files/OpenRTM-aist/1.1/cmake
+# UNIX:
+# <prefix>/lib/<name>*/cmake: /usr/lib/openrtm-1.1/cmake
+# Mac OS X
+# <prefix>/lib/<name>*/cmake: /opt/local/lib/openrtm-1.1/cmake
+#
+# Users' CMakeList.txt just only use the following find_package() command
+# find_package(OpenRTM-aist ....)
+# ^^^^^^^^^^^^ cmake handle <name> case-insensitively
+#
+#
+#
+# testing find_package ability
+#
+# Windows)
+# configfile: C:\Program Files\OpenRTM-aist\1.1\cmake\
+# directives:
+# find_package(OpenRTM CONFIGS OpenRTMConfig.cmake): OK
+# find_package(openrtm CONFIGS OpenRTMConfig.cmake): OK
+# find_package(OpenRTM-aist CONFIGS OpenRTMConfig.cmake): OK
+# find_package(openrtm-aist CONFIGS OpenRTMConfig.cmake): OK
+#
+# UNIX)
+# configfile: /usr/lib/openrtm-1.1/cmake/OpenRTMConfig.cmake
+# directives:
+# find_package(openrtm CONFIGS OpenRTMConfig.cmake): OK
+# find_package(OpenRTM CONFIGS OpenRTMConfig.cmake): OK
+# find_package(OpenRTM-aist CONFIGS OpenRTMConfig.cmake): NG
+# find_package(openrtm-aist CONFIGS OpenRTMConfig.cmake): NG
+# find_package(OpenRTM-aist CONFIGS OpenRTMConfig.cmake NAMES openrtm): OK
+# find_package(openrtm-aist CONFIGS OpenRTMConfig.cmake NAMES openrtm): OK
+#
+
+AUTOMAKE_OPTIONS = 1.4
+
+ORB = @ORB@
+IDLC = @IDLC@
+IDLFLAGS = @IDL_FLAGS@
+
+cmakedir = ${rtm_libdir}/cmake
+cmake_DATA = OpenRTMConfig.cmake FindOpenRTM.cmake
+
+# basic compiler/linker options
+OPENRTM_CFLAGS=`echo "${CXXFLAGS}" | sed -e 's/\-I[^ ]*//g'`
+OPENRTM_INCLUDE_DIRS= \
+ -I${prefix}/include \
+ -I${coil_includedir} \
+ -I${rtm_includedir} \
+ -I${rtm_includedir}/rtm/idl
+OPENRTM_LDFLAGS_=`echo "${LDFLAGS}" | sed -e 's/\-L[^ ]*//g'`
+OPENRTM_LIBRARY_DIRS=-L${prefix}/lib
+OPENRTM_LIBRARIES_=${LIBS} -lRTC -lcoil
+
+# OpenRTM-aist specific directory
+COIL_INCLUDE_DIR=${coil_includedir}
+OPENRTM_INCLUDE_DIR=${rtm_includedir}
+OPENRTM_LIB_DIR=${rtm_libdir}
+OPENRTM_DATA_DIR=${rtm_datadir}
+
+# OpenRTM-aist version
+OPENRTM_VERSION=${RTM_VERSION}
+OPENRTM_VERSION_MAJOR=${RTM_MAJOR_VERSION}
+OPENRTM_VERSION_MINOR=${RTM_MINOR_VERSION}
+OPENRTM_REVISION_NUM=${RTM_REVISION_NUM}
+OPENRTM_SHORT_VERSION=${RTM_SHORT_VERSION}
+
+# OpenRTM-aist's CORBA related settings
+OPENRTM_ORB=${ORB}
+OPENRTM_IDL_WRAPPER=rtm-skelwrapper
+OPENRTM_IDL_WRAPPER_FLAGS=--include-dir="" --skel-suffix=Skel --stub-suffix=Stub
+OPENRTM_IDLC=${IDLC}
+OPENRTM_IDLFLAGS=${IDLFLAGS}
+
+
+OpenRTMConfig.cmake: Makefile.am
+ echo "# -*- cmake -*-" > $@
+ echo "#" >> $@
+ echo "# @file OpenRTMConfig.cmake" >> $@
+ echo "# @brief cmake-config file for OpenRTM-aist" >> $@
+ echo "# @author Noriaki Ando" >> $@
+ echo "# @date "`date` >> $@
+ echo "#" >> $@
+ echo "# This file is used for cmake config-mode." >> $@
+ echo "# The following variables are defined." >> $@
+ echo "#" >> $@
+ echo "# Basic compiler/linker options" >> $@
+ echo "# - OPENRTM_CFLAGS: cflags " >> $@
+ echo "# - OPENRTM_INCLUDE_DIRS: include directories" >> $@
+ echo "# - OPENRTM_LDFLAGS: linker options" >> $@
+ echo "# - OPENRTM_LIBRARY_DIRS: library directories" >> $@
+ echo "# - OPENRTM_LIBRARIES: libraries" >> $@
+ echo "# - OPENRTM_LIB_DIR: OpenRTM's lib directory" >> $@
+ echo "#" >> $@
+ echo "# OpenRTM-aist specific directory" >> $@
+ echo "# - COIL_INCLUDE_DIR: coil include dir" >> $@
+ echo "# - OPENRTM_INCLUDE_DIR: OpenRTM's include directory" >> $@
+ echo "# - OPENRTM_LIB_DIR: OpenRTM's lib directory" >> $@
+ echo "# - OPENRTM_DATA_DIR: OpenRTM's shared directory" >> $@
+ echo "#" >> $@
+ echo "# OpenRTM-aist version" >> $@
+ echo "# - OPENRTM_VERSION: x.y.z version" >> $@
+ echo "# - OPENRTM_VERSION_MAJOR: major version number" >> $@
+ echo "# - OPENRTM_VERSION_MINOR: minor version number" >> $@
+ echo "# - OPENRTM_VERSION_PATCH: revision number" >> $@
+ echo "# - OPENRTM_SHORT_VERSION: short version number 1.1.0->110" >> $@
+ echo "#" >> $@
+ echo "# OpenRTM-aist's CORBA related settings" >> $@
+ echo "# - OPENRTM_ORB: CORBA implementation" >> $@
+ echo "# - OPENRTM_IDL_WRAPPER: rtm-skelwrapper command" >> $@
+ echo "# - OPENRTM_IDL_WRAPPER_FLAGS: rtm-skelwrapper flag" >> $@
+ echo "# - OPENRTM_IDLC: IDL command" >> $@
+ echo "# - OPENRTM_IDLFLAGS: IDL optins" >> $@
+ echo "" >> $@
+ echo 'message(STATUS "OpenRTMConfig.cmake found.")' >> $@
+ echo 'message(STATUS "Configrued by configuration mode.")' >> $@
+ echo "" >> $@
+ echo "" >> $@
+ echo "# Basic compiler/linker options" >> $@
+ echo "set(OPENRTM_CFLAGS ${OPENRTM_CFLAGS})" >> $@
+ echo "set(OPENRTM_INCLUDE_DIRS ${OPENRTM_INCLUDE_DIRS})" >> $@
+ echo "set(OPENRTM_LDFLAGS ${OPENRTM_LDFLAGS_})" >> $@
+ echo "set(OPENRTM_LIBRARY_DIRS ${OPENRTM_LIBRARY_DIRS})" >> $@
+ echo "set(OPENRTM_LIBRARIES ${OPENRTM_LIBRARIES_})" >> $@
+ echo "set(OPENRTM_LIB_DIR ${OPENRTM_LIB_DIR})" >> $@
+ echo "" >> $@
+ echo "# OpenRTM-aist specific directory" >> $@
+ echo "set(COIL_INCLUDE_DIR ${COIL_INCLUDE_DIR})" >> $@
+ echo "set(OPENRTM_INCLUDE_DIR ${OPENRTM_INCLUDE_DIR})" >> $@
+ echo "set(OPENRTM_LIB_DIR ${OPENRTM_LIB_DIR})" >> $@
+ echo "set(OPENRTM_DATA_DIR ${OPENRTM_DATA_DIR})" >> $@
+ echo "" >> $@
+ echo "# OpenRTM-aist version" >> $@
+ echo "set(OPENRTM_VERSION ${OPENRTM_VERSION})" >> $@
+ echo "set(OPENRTM_VERSION_MAJOR ${OPENRTM_VERSION_MAJOR})" >> $@
+ echo "set(OPENRTM_VERSION_MINOR ${OPENRTM_VERSION_MINOR})" >> $@
+ echo "set(OPENRTM_VERSION_PATCH ${OPENRTM_REVISION_NUM})" >> $@
+ echo "set(OPENRTM_SHORT_VERSION ${OPENRTM_SHORT_VERSION})" >> $@
+ echo "" >> $@
+ echo "# OpenRTM-aist's CORBA related settings" >> $@
+ echo "set(OPENRTM_ORB ${OPENRTM_ORB})" >> $@
+ echo "set(OPENRTM_IDL_WRAPPER ${OPENRTM_IDL_WRAPPER})" >> $@
+ echo "set(OPENRTM_IDL_WRAPPER_FLAGS ${OPENRTM_IDL_WRAPPER_FLAGS})" >> $@
+ echo "set(OPENRTM_IDLC ${OPENRTM_IDLC})" >> $@
+ echo "set(OPENRTM_IDLFLAGS ${OPENRTM_IDLFLAGS})" >> $@
+ echo "" >> $@
+ echo 'message(STATUS "OpenRTM-aist configuration done")' >> $@
+ echo "# end of OpenRTMConfig.cmake" >> $@
+
+
+EXTRA_DIST = FindOpenRTM.cmake
+
+clean-local:
+ rm -f OpenRTMConfig.cmake
+ rm -rf *~
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/Makefile.am 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/Makefile.am 2011-06-06 00:32:16 UTC (rev 2176)
@@ -27,7 +27,7 @@
echo 'rtm_prefix="'${prefix}'"' >> $@
echo 'rtm_exec_prefix="'${exec_prefix}'"' >> $@
echo 'rtm_cxx="'${CXX}'"' >> $@
- echo 'rtm_cflags="'${CXXFLAGS}' -I'${prefix}'/include -I'${rtm_includedir}' -I'${rtm_includedir}'/rtm/idl"' >> $@
+ echo 'rtm_cflags="'${CXXFLAGS}' -I'${prefix}'/include -I'${coil_includedir}' -I'${rtm_includedir}' -I'${rtm_includedir}'/rtm/idl"' >> $@
echo 'rtm_libs="'${LDFLAGS}' -L'${prefix}'/lib '${LIBS}' -lRTC -lcoil"' >> $@
echo 'rtm_libdir="'${rtm_libdir}'"' >> $@
echo 'rtm_version="'${RTM_VERSION}'"' >> $@
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/openrtm-aist.pc.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/openrtm-aist.pc.in 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/openrtm-aist.pc.in 2011-06-06 00:32:16 UTC (rev 2176)
@@ -5,7 +5,7 @@
rtm_prefix=@prefix@
rtm_exec_prefix=@exec_prefix@
rtm_cxx=@CXX@
-rtm_cflags=@CXXFLAGS@ -I${prefix}/include -I at rtm_includedir@ -I at rtm_includedir@/rtm/idl
+rtm_cflags=@CXXFLAGS@ -I${prefix}/include -I at coil_includedir@ -I at rtm_includedir@ -I at rtm_includedir@/rtm/idl
rtm_libs=@LDFLAGS@ -L${prefix}/lib @LIBS@ -lRTC -lcoil
rtm_libdir=@pkglibdir@
rtm_version=@RTM_VERSION@
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2011-06-06 00:32:16 UTC (rev 2176)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = bin etc build docs examples ext utils coil rtm installer .
+SUBDIRS = bin etc cmake build docs examples ext utils coil rtm installer .
clean-local:
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat 2011-06-06 00:32:16 UTC (rev 2176)
@@ -36,15 +36,19 @@
@rem ============================================================
@rem convert property sheet to cmake
@rem ============================================================
-if not exist rtm_config.cmake (
+set TMP_PYTHONPATH=%PYTHONPATH%
+set PYTHONPATH=./bin;%PYTHONPATH%
- set TMP_PYTHONPATH=%PYTHONPATH%
- set PYTHONPATH=./bin;%PYTHONPATH%
- echo Generating cmake file
- build\vsprops2cmake.py rtm_config.vsprops
- set PYTHONPATH=%TMP_PYTHONPATH%
-)
+echo Generating rtm_config.cmake file
+build\vsprops2cmake.py rtm_config.vsprops
+move rtm_config.cmake cmake
+echo Generating OpenRTMConfig.cmake file
+build\cmakeconfgen.py rtm_config.vsprops
+move OpenRTMConfig.cmake cmake
+
+set PYTHONPATH=%TMP_PYTHONPATH%
+
@rem ============================================================
@rem build OpenRTM-aist
@rem ============================================================
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat 2011-06-06 00:32:16 UTC (rev 2176)
@@ -35,15 +35,19 @@
@rem ============================================================
@rem convert property sheet to cmake
@rem ============================================================
-if not exist rtm_config.cmake (
+set TMP_PYTHONPATH=%PYTHONPATH%
+set PYTHONPATH=./bin;%PYTHONPATH%
- set TMP_PYTHONPATH=%PYTHONPATH%
- set PYTHONPATH=./bin;%PYTHONPATH%
- echo Generating cmake file
- build\vsprops2cmake.py rtm_config.vsprops
- set PYTHONPATH=%TMP_PYTHONPATH%
-)
+echo Generating rtm_config.cmake file
+build\vsprops2cmake.py rtm_config.vsprops
+move rtm_config.cmake cmake
+echo Generating OpenRTMConfig.cmake file
+build\cmakeconfgen.py rtm_config.vsprops
+move OpenRTMConfig.cmake cmake
+
+set PYTHONPATH=%TMP_PYTHONPATH%
+
@rem ============================================================
@rem build OpenRTM-aist
@rem ============================================================
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat 2011-06-06 00:32:16 UTC (rev 2176)
@@ -35,15 +35,19 @@
@rem ============================================================
@rem convert property sheet to cmake
@rem ============================================================
-if not exist rtm_config.cmake (
+set TMP_PYTHONPATH=%PYTHONPATH%
+set PYTHONPATH=./bin;%PYTHONPATH%
- set TMP_PYTHONPATH=%PYTHONPATH%
- set PYTHONPATH=./bin;%PYTHONPATH%
- echo Generating cmake file
- build\vsprops2cmake.py rtm_config.vsprops
- set PYTHONPATH=%TMP_PYTHONPATH%
-)
+echo Generating rtm_config.cmake file
+build\vsprops2cmake.py rtm_config.vsprops
+move rtm_config.cmake cmake
+echo Generating OpenRTMConfig.cmake file
+build\cmakeconfgen.py rtm_config.vsprops
+move OpenRTMConfig.cmake cmake
+
+set PYTHONPATH=%TMP_PYTHONPATH%
+
@rem ============================================================
@rem build OpenRTM-aist
@rem ============================================================
Property changes on: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake
___________________________________________________________________
Added: svn:ignore
+ svn: warning: cannot set LC_CTYPE locale
svn: warning: environment variable LANG is JPN
svn: warning: please check that your locale name is correct
Makefile.in
Deleted: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am 2011-06-05 17:48:59 UTC (rev 2172)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am 2011-06-06 00:32:16 UTC (rev 2176)
@@ -1,84 +0,0 @@
-## -*- Makefile -*-
-##---------------------------------------------------------------------------
-## Makefile for cmake: creating OpenRTM-aist's FindOpenRTM.cmake for cmake
-##
-## $Id$
-##---------------------------------------------------------------------------
-#
-# CMake's OpenRTMFind.cmake installation diretories
-#
-# * for the Windows systems
-# <prefix>/ (W)
-# <prefix>/(cmake|CMake)/ (W)
-# <prefix>/<name>*/ (W)
-# <prefix>/<name>*/(cmake|CMake)/ (W)
-#
-# * for the UNIX systems
-# <prefix>/(share|lib)/cmake/<name>*/ (U)
-# <prefix>/(share|lib)/<name>*/ (U)
-# <prefix>/(share|lib)/<name>*/(cmake|CMake)/ (U)
-#
-# In Mac OS X with MacPorts, <prefix> might be /opt/local. (not confirmed)
-# And on systems supporting OS X Frameworks and Application Bundles
-# the following directories are searched for frameworks or bundles
-# containing a configuration file:
-#
-# * for Mac OS X with frameworks and Application Bundles
-# <prefix>/<name>.framework/Resources/ (A)
-# <prefix>/<name>.framework/Resources/CMake/ (A)
-# <prefix>/<name>.framework/Versions/*/Resources/ (A)
-# <prefix>/<name>.framework/Versions/*/Resources/CMake/ (A)
-# <prefix>/<name>.app/Contents/Resources/ (A)
-# <prefix>/<name>.app/Contents/Resources/CMake/ (A)
-#
-# for the OpenRTM-aist
-#
-# Windows:
-# <prefix>/<name>*/cmake: C:/Progam Files/OpenRTM-aist/1.1/cmake
-# UNIX:
-# <prefix>/share/<name>*/cmake: /usr/share/openrtm-1.1/cmake
-# Mac OS X
-# <prefix>/share/<name>*/cmake: /opt/local/share/openrtm-1.1/cmake
-#
-# Users' CMakeList.txt just only use the following find_package() command
-# find_package(OpenRTM-aist ....)
-# ^^^^^^^^^^^^ cmake handle <name> case-insensitively
-#
-#
-#
-# testing find_package ability
-#
-# Windows)
-# configfile: C:\Program Files\OpenRTM-aist\1.1\cmake\
-# directives:
-# find_package(OpenRTM CONFIGS OpenRTMConfig.cmake): OK
-# find_package(openrtm CONFIGS OpenRTMConfig.cmake): OK
-# find_package(OpenRTM-aist CONFIGS OpenRTMConfig.cmake): OK
-# find_package(openrtm-aist CONFIGS OpenRTMConfig.cmake): OK
-#
-# UNIX)
-# configfile: /usr/share/openrtm-1.1/cmake/OpenRTMConfig.cmake
-# directives:
-# find_package(openrtm CONFIGS OpenRTMConfig.cmake): OK
-# find_package(OpenRTM CONFIGS OpenRTMConfig.cmake): OK
-# find_package(OpenRTM-aist CONFIGS OpenRTMConfig.cmake): NG
-# find_package(openrtm-aist CONFIGS OpenRTMConfig.cmake): NG
-# find_package(OpenRTM-aist CONFIGS OpenRTMConfig.cmake NAMES openrtm): OK
-# find_package(openrtm-aist CONFIGS OpenRTMConfig.cmake NAMES openrtm): OK
-#
-
-clean-local:
- rm -f OpenRTMConfig.cmake FindOpenRTM.cmake
- rm -rf *~
-
-wxs:
- cp -p cmake.yaml ../installer/cmake.yaml
-
-FindOpenRTM.cmake:
- cp $(top_srcdir)/utils/cmake/FindOpenRTM.cmake .
-
-dist-hook: clean-local FindOpenRTM.cmake wxs
-
-EXTRA_DIST = \
- FindOpenRTM.cmake \
- cmake.yaml
Copied: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am (from rev 2172, trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am 2011-06-06 00:32:16 UTC (rev 2176)
@@ -0,0 +1,84 @@
+## -*- Makefile -*-
+##---------------------------------------------------------------------------
+## Makefile for cmake: creating OpenRTM-aist's FindOpenRTM.cmake for cmake
+##
+## $Id$
+##---------------------------------------------------------------------------
+#
+# CMake's OpenRTMFind.cmake installation diretories
+#
+# * for the Windows systems
+# <prefix>/ (W)
+# <prefix>/(cmake|CMake)/ (W)
+# <prefix>/<name>*/ (W)
+# <prefix>/<name>*/(cmake|CMake)/ (W)
+#
+# * for the UNIX systems
+# <prefix>/(share|lib)/cmake/<name>*/ (U)
+# <prefix>/(share|lib)/<name>*/ (U)
+# <prefix>/(share|lib)/<name>*/(cmake|CMake)/ (U)
+#
+# In Mac OS X with MacPorts, <prefix> might be /opt/local. (not confirmed)
+# And on systems supporting OS X Frameworks and Application Bundles
+# the following directories are searched for frameworks or bundles
+# containing a configuration file:
+#
+# * for Mac OS X with frameworks and Application Bundles
+# <prefix>/<name>.framework/Resources/ (A)
+# <prefix>/<name>.framework/Resources/CMake/ (A)
+# <prefix>/<name>.framework/Versions/*/Resources/ (A)
+# <prefix>/<name>.framework/Versions/*/Resources/CMake/ (A)
+# <prefix>/<name>.app/Contents/Resources/ (A)
+# <prefix>/<name>.app/Contents/Resources/CMake/ (A)
+#
+# for the OpenRTM-aist
+#
+# Windows:
+# <prefix>/<name>*/cmake: C:/Progam Files/OpenRTM-aist/1.1/cmake
+# UNIX:
+# <prefix>/share/<name>*/cmake: /usr/share/openrtm-1.1/cmake
+# Mac OS X
+# <prefix>/share/<name>*/cmake: /opt/local/share/openrtm-1.1/cmake
+#
+# Users' CMakeList.txt just only use the following find_package() command
+# find_package(OpenRTM-aist ....)
+# ^^^^^^^^^^^^ cmake handle <name> case-insensitively
+#
+#
+#
+# testing find_package ability
+#
+# Windows)
+# configfile: C:\Program Files\OpenRTM-aist\1.1\cmake\
+# directives:
+# find_package(OpenRTM CONFIGS OpenRTMConfig.cmake): OK
+# find_package(openrtm CONFIGS OpenRTMConfig.cmake): OK
+# find_package(OpenRTM-aist CONFIGS OpenRTMConfig.cmake): OK
+# find_package(openrtm-aist CONFIGS OpenRTMConfig.cmake): OK
+#
+# UNIX)
+# configfile: /usr/share/openrtm-1.1/cmake/OpenRTMConfig.cmake
+# directives:
+# find_package(openrtm CONFIGS OpenRTMConfig.cmake): OK
+# find_package(OpenRTM CONFIGS OpenRTMConfig.cmake): OK
+# find_package(OpenRTM-aist CONFIGS OpenRTMConfig.cmake): NG
+# find_package(openrtm-aist CONFIGS OpenRTMConfig.cmake): NG
+# find_package(OpenRTM-aist CONFIGS OpenRTMConfig.cmake NAMES openrtm): OK
+# find_package(openrtm-aist CONFIGS OpenRTMConfig.cmake NAMES openrtm): OK
+#
+
+clean-local:
+ rm -f OpenRTMConfig.cmake FindOpenRTM.cmake
+ rm -rf *~
+
+wxs:
+ cp -p cmake.yaml ../installer/cmake.yaml
+
+FindOpenRTM.cmake:
+ cp $(top_srcdir)/utils/cmake/FindOpenRTM.cmake .
+
+dist-hook: clean-local FindOpenRTM.cmake wxs
+
+EXTRA_DIST = \
+ FindOpenRTM.cmake \
+ cmake.yaml
Deleted: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml 2011-06-05 17:48:59 UTC (rev 2172)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml 2011-06-06 00:32:16 UTC (rev 2176)
@@ -1,17 +0,0 @@
-Cmake:
- GUID: 1E25EFF6-8C7C-11E0-9306-000C290BB873
- Files:
- - Id: Cmake000
- ShortName: findopen.cma
- Name: FindOpenRTM.cmake
- Source: ..\\cmake\\FindOpenRTM.cmake
- - Id: Cmake001
- ShortName: openrtmc.cma
- Name: OpenRTMConfig.cmake
- Source: ..\\cmake\\OpenRTMConfig.cmake
- - Id: Cmake002
- ShortName: rtm_c000.cma
- Name: rtm_config.cmake
- Source: ..\\cmake\\rtm_config.cmake
-
-
Copied: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml (from rev 2172, trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml 2011-06-06 00:32:16 UTC (rev 2176)
@@ -0,0 +1,17 @@
+Cmake:
+ GUID: 1E25EFF6-8C7C-11E0-9306-000C290BB873
+ Files:
+ - Id: Cmake000
+ ShortName: findopen.cma
+ Name: FindOpenRTM.cmake
+ Source: ..\\cmake\\FindOpenRTM.cmake
+ - Id: Cmake001
+ ShortName: openrtmc.cma
+ Name: OpenRTMConfig.cmake
+ Source: ..\\cmake\\OpenRTMConfig.cmake
+ - Id: Cmake002
+ ShortName: rtm_c000.cma
+ Name: rtm_config.cmake
+ Source: ..\\cmake\\rtm_config.cmake
+
+
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/etc.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/etc.yaml 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/etc.yaml 2011-06-06 00:32:16 UTC (rev 2176)
@@ -20,4 +20,4 @@
- Id: Etc0005
ShortName: rtm_c000.cma
Name: rtm_config.cmake
- Source: ..\\rtm_config.cmake
+ Source: ..\\cmake\\rtm_config.cmake
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in 2011-06-05 23:39:33 UTC (rev 2175)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in 2011-06-06 00:32:16 UTC (rev 2176)
@@ -101,6 +101,17 @@
{% endfor %}
</Component>
</Directory>
+ <!-- cmake -->
+ <Directory Id="cmake" Name="cmake">
+ <Component Id="Cmake" Guid="{% Cmake.GUID %}">
+ {% for file in Cmake.Files %}
+ <File Id="{% file.Id %}"
+ Name="{% file.Name %}" DiskId="1"
+ Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
<!-- rtm -->
<Directory Id="rtm" Name="rtm">
<Component Id="Headers" Guid="{% Headers.GUID %}">
@@ -336,6 +347,7 @@
<ComponentRef Id="Bin"/>
<ComponentRef Id="COILs"/>
<ComponentRef Id="Etc"/>
+ <ComponentRef Id="Cmake"/>
<ComponentRef Id="SDOService"/>
</Feature>
<!-- devel -->
openrtm-commit メーリングリストの案内