[openrtm-commit:02963] r3099 - in branches/RELENG_1_2/OpenRTM-aist: . docs packages/deb/debian utils/cmake win32/OpenRTM-aist/cmake
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 12月 10日 (日) 09:07:31 JST
Author: n-ando
Date: 2017-12-10 09:07:31 +0900 (Sun, 10 Dec 2017)
New Revision: 3099
Removed:
branches/RELENG_1_2/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake
branches/RELENG_1_2/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org
Modified:
branches/RELENG_1_2/OpenRTM-aist/configure.ac
branches/RELENG_1_2/OpenRTM-aist/docs/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/packages/deb/debian/rules
branches/RELENG_1_2/OpenRTM-aist/utils/cmake/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am
Log:
merged chages from trunk/OpenRTM-aist r2892-2912 during 2017-01:
[compat,bugfix,->RELENG_1_1] fixed bug. refs #3887
[compat,->RELENG_1_2] FindOpenRTM.cmake has been removed from the repository. refs #3888
[compat,->RELENG_1_2] Example directory has been removed from openrtm-aist deb package. refs #3891
[compat,->RELENG_1_2] The installation of the deb package of openrtm-aist-example and openrtm-aist-doc has been changed. refs #3892
Modified: branches/RELENG_1_2/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/configure.ac 2017-12-10 00:05:43 UTC (rev 3098)
+++ branches/RELENG_1_2/OpenRTM-aist/configure.ac 2017-12-10 00:07:31 UTC (rev 3099)
@@ -1515,8 +1515,9 @@
rtm_rtmdir=$rtm_libdir"/rtm"
rtm_svcdir=$rtm_libdir"/svc"
rtm_sdodir=$rtm_libdir"/sdo"
-rtm_docdir=$rtm_datadir"/doc"
-rtm_exampledir=$rtm_datadir"/example"
+rtm_cxx_docdir=$rtm_datadir"/doc/c++"
+rtm_idl_docdir=$rtm_datadir"/doc/idl"
+rtm_exampledir=$rtm_datadir"/components/c++/examples"
AC_SUBST(rtm_libdir)
AC_SUBST(rtm_datadir)
@@ -1528,7 +1529,8 @@
AC_SUBST(rtm_rtmdir)
AC_SUBST(rtm_svcdir)
AC_SUBST(rtm_sdodir)
-AC_SUBST(rtm_docdir)
+AC_SUBST(rtm_cxx_docdir)
+AC_SUBST(rtm_idl_docdir)
AC_SUBST(rtm_exampledir)
dnl ------------------------------------------------------------
Modified: branches/RELENG_1_2/OpenRTM-aist/docs/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/docs/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
+++ branches/RELENG_1_2/OpenRTM-aist/docs/Makefile.am 2017-12-10 00:07:31 UTC (rev 3099)
@@ -7,6 +7,8 @@
AUTOMAKE_OPTIONS = 1.4
+all: doxygen_classref.conf
+
ClassReference:
make -f Makefile.docs ClassReference
@@ -28,7 +30,7 @@
doxygen_classref.conf:
sed -e 's/__VERSION__/$(VERSION)/g' doxygen_classref.conf.in > doxygen_classref.conf
-docdir = $(rtm_docdir)
+#docdir = $(rtm_docdir)
EXTRA_DIST = \
doxygen_classref.conf \
@@ -50,10 +52,10 @@
install-class-reference:
if test -d ClassReference; then \
- $(mkinstalldirs) $(DESTDIR)$(rtm_docdir)/ClassReference/html; \
+ $(mkinstalldirs) $(DESTDIR)$(rtm_cxx_docdir)/ClassReference/html; \
for x in ClassReference/html/*; do \
if test -f $$x; then \
- $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_docdir)/ClassReference/html/;\
+ $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_cxx_docdir)/ClassReference/html/;\
fi \
done \
fi
@@ -60,10 +62,10 @@
install-class-reference-en:
if test -d ClassReference-en; then \
- $(mkinstalldirs) $(DESTDIR)$(rtm_docdir)/ClassReference-en/html; \
+ $(mkinstalldirs) $(DESTDIR)$(rtm_cxx_docdir)/ClassReference-en/html; \
for x in ClassReference-en/html/*; do \
if test -f $$x; then \
- $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_docdir)/ClassReference-en/html/;\
+ $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_cxx_docdir)/ClassReference-en/html/;\
fi \
done \
fi
@@ -70,10 +72,10 @@
install-idl-reference:
if test -d IDLReference; then \
- $(mkinstalldirs) $(DESTDIR)$(rtm_docdir)/IDLReference/html; \
+ $(mkinstalldirs) $(DESTDIR)$(rtm_idl_docdir)/IDLReference/html; \
for x in IDLReference/html/*; do \
if test -f $$x; then \
- $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_docdir)/IDLReference/html/;\
+ $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_idl_docdir)/IDLReference/html/;\
fi \
done \
fi
@@ -80,10 +82,10 @@
install-idl-reference-en:
if test -d IDLReference-en; then \
- $(mkinstalldirs) $(DESTDIR)$(rtm_docdir)/IDLReference-en/html; \
+ $(mkinstalldirs) $(DESTDIR)$(rtm_idl_docdir)/IDLReference-en/html; \
for x in IDLReference-en/html/*; do \
if test -f $$x; then \
- $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_docdir)/IDLReference-en/html/;\
+ $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_idl_docdir)/IDLReference-en/html/;\
fi \
done \
fi
Modified: branches/RELENG_1_2/OpenRTM-aist/packages/deb/debian/rules
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/packages/deb/debian/rules 2017-12-10 00:05:43 UTC (rev 3098)
+++ branches/RELENG_1_2/OpenRTM-aist/packages/deb/debian/rules 2017-12-10 00:07:31 UTC (rev 3099)
@@ -24,6 +24,9 @@
# Multiarch support
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+# short version number
+SHORT_VER := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -b 1-3)
+
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -106,6 +109,7 @@
(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)
+ (rm -r $(CURDIR)/debian/openrtm-aist/usr/share/openrtm-$(SHORT_VER))
# for openrtm-dev package
#$(MAKE)
Deleted: branches/RELENG_1_2/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake 2017-12-10 00:05:43 UTC (rev 3098)
+++ branches/RELENG_1_2/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake 2017-12-10 00:07:31 UTC (rev 3099)
@@ -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}")
Deleted: branches/RELENG_1_2/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org 2017-12-10 00:05:43 UTC (rev 3098)
+++ branches/RELENG_1_2/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake.org 2017-12-10 00:07:31 UTC (rev 3099)
@@ -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}")
Modified: branches/RELENG_1_2/OpenRTM-aist/utils/cmake/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/utils/cmake/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
+++ branches/RELENG_1_2/OpenRTM-aist/utils/cmake/Makefile.am 2017-12-10 00:07:31 UTC (rev 3099)
@@ -74,7 +74,7 @@
IDLFLAGS = @IDL_FLAGS@
cmakedir = ${rtm_libdir}/cmake
-cmake_DATA = OpenRTMConfig.cmake FindOpenRTM.cmake
+cmake_DATA = OpenRTMConfig.cmake
# basic compiler/linker options
OPENRTM_CFLAGS=`echo "${CXXFLAGS}" | sed -e 's/\-I[^ ]*//g'`
@@ -197,8 +197,6 @@
echo "# end of OpenRTMConfig.cmake" >> $@
-EXTRA_DIST = FindOpenRTM.cmake
-
clean-local:
rm -f OpenRTMConfig.cmake
rm -rf *~
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am 2017-12-10 00:07:31 UTC (rev 3099)
@@ -68,14 +68,10 @@
#
clean-local:
- rm -f OpenRTMConfig.cmake FindOpenRTM.cmake
+ rm -f OpenRTMConfig.cmake
rm -rf *~
-FindOpenRTM.cmake:
- cp $(top_srcdir)/utils/cmake/FindOpenRTM.cmake .
+dist-hook: clean-local
-dist-hook: clean-local FindOpenRTM.cmake
-
EXTRA_DIST = \
- FindOpenRTM.cmake \
cmake.yaml
More information about the openrtm-commit
mailing list