[openrtm-commit:00172] r185 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: resource/100/CXX/build/cmake1/cmake_modules resource/100/CXX/build/cmake2/cmake_modules src/jp/go/aist/rtm/rtcbuilder/template/cmake
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 6月 6日 (月) 13:05:36 JST
Author: ta
Date: 2011-06-06 13:05:36 +0900 (Mon, 06 Jun 2011)
New Revision: 185
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules/FindOpenRTM.cmake
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules/FindOpenRTM.cmake
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl
Log:
update configuration with rtm_config.cmake.
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules/FindOpenRTM.cmake
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules/FindOpenRTM.cmake 2011-05-30 09:18:15 UTC (rev 184)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules/FindOpenRTM.cmake 2011-06-06 04:05:36 UTC (rev 185)
@@ -125,14 +125,10 @@
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}")
+ foreach(library ${omni_lib})
list(APPEND OMNIORB_LIBRARIES optimized "${library}")
endforeach()
- string(REGEX REPLACE " " ";" libs "${omni_libd}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
+ foreach(library ${omni_libd})
list(APPEND OMNIORB_LIBRARIES debug "${library}")
endforeach()
@@ -165,33 +161,23 @@
set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
- string(REGEX REPLACE " " ";" libs "${rtm_lib}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
+ foreach(library ${rtm_lib})
list(APPEND OPENRTM_LIBRARIES optimized "${library}")
endforeach()
- string(REGEX REPLACE " " ";" libs "${coil_lib}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
+ foreach(library ${coil_lib})
list(APPEND OPENRTM_LIBRARIES optimized "${library}")
endforeach()
- string(REGEX REPLACE " " ";" libs "${rtm_libd}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
+ foreach(library ${rtm_libd})
list(APPEND OPENRTM_LIBRARIES debug "${library}")
endforeach()
- string(REGEX REPLACE " " ";" libs "${coil_libd}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
+ foreach(library ${coil_libd})
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}")
+ foreach(flag ${rtm_idlflags})
string(REGEX REPLACE "[\\]" "/" flag "${flag}")
list(APPEND OPENRTM_IDLFLAGS "${flag}")
endforeach()
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules/FindOpenRTM.cmake
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules/FindOpenRTM.cmake 2011-05-30 09:18:15 UTC (rev 184)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules/FindOpenRTM.cmake 2011-06-06 04:05:36 UTC (rev 185)
@@ -125,14 +125,10 @@
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}")
+ foreach(library ${omni_lib})
list(APPEND OMNIORB_LIBRARIES optimized "${library}")
endforeach()
- string(REGEX REPLACE " " ";" libs "${omni_libd}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
+ foreach(library ${omni_libd})
list(APPEND OMNIORB_LIBRARIES debug "${library}")
endforeach()
@@ -165,33 +161,23 @@
set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
- string(REGEX REPLACE " " ";" libs "${rtm_lib}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
+ foreach(library ${rtm_lib})
list(APPEND OPENRTM_LIBRARIES optimized "${library}")
endforeach()
- string(REGEX REPLACE " " ";" libs "${coil_lib}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
+ foreach(library ${coil_lib})
list(APPEND OPENRTM_LIBRARIES optimized "${library}")
endforeach()
- string(REGEX REPLACE " " ";" libs "${rtm_libd}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
+ foreach(library ${rtm_libd})
list(APPEND OPENRTM_LIBRARIES debug "${library}")
endforeach()
- string(REGEX REPLACE " " ";" libs "${coil_libd}")
- foreach(library ${libs})
- string(REGEX REPLACE ".lib$" "" library "${library}")
+ foreach(library ${coil_libd})
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}")
+ foreach(flag ${rtm_idlflags})
string(REGEX REPLACE "[\\]" "/" flag "${flag}")
list(APPEND OPENRTM_IDLFLAGS "${flag}")
endforeach()
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl 2011-05-30 09:18:15 UTC (rev 184)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl 2011-06-06 04:05:36 UTC (rev 185)
@@ -125,14 +125,10 @@
set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
endif()
- string(REGEX REPLACE " " ";" libs "${dol}{omni_lib}")
- foreach(library ${dol}{libs})
- string(REGEX REPLACE ".lib${dol}" "" library "${dol}{library}")
+ foreach(library ${dol}{omni_lib})
list(APPEND OMNIORB_LIBRARIES optimized "${dol}{library}")
endforeach()
- string(REGEX REPLACE " " ";" libs "${dol}{omni_libd}")
- foreach(library ${dol}{libs})
- string(REGEX REPLACE ".lib${dol}" "" library "${dol}{library}")
+ foreach(library ${dol}{omni_libd})
list(APPEND OMNIORB_LIBRARIES debug "${dol}{library}")
endforeach()
@@ -165,33 +161,23 @@
set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
- string(REGEX REPLACE " " ";" libs "${dol}{rtm_lib}")
- foreach(library ${dol}{libs})
- string(REGEX REPLACE ".lib${dol}" "" library "${dol}{library}")
+ foreach(library ${dol}{rtm_lib})
list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}")
endforeach()
- string(REGEX REPLACE " " ";" libs "${dol}{coil_lib}")
- foreach(library ${dol}{libs})
- string(REGEX REPLACE ".lib${dol}" "" library "${dol}{library}")
+ foreach(library ${dol}{coil_lib})
list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}")
endforeach()
- string(REGEX REPLACE " " ";" libs "${dol}{rtm_libd}")
- foreach(library ${dol}{libs})
- string(REGEX REPLACE ".lib${dol}" "" library "${dol}{library}")
+ foreach(library ${dol}{rtm_libd})
list(APPEND OPENRTM_LIBRARIES debug "${dol}{library}")
endforeach()
- string(REGEX REPLACE " " ";" libs "${dol}{coil_libd}")
- foreach(library ${dol}{libs})
- string(REGEX REPLACE ".lib${dol}" "" library "${dol}{library}")
+ foreach(library ${dol}{coil_libd})
list(APPEND OPENRTM_LIBRARIES debug "${dol}{library}")
endforeach()
${sharp} IDL Compiler
set(OPENRTM_IDLC "${dol}{rtm_idlc}")
- string(REGEX REPLACE " " ";" flags "${dol}{rtm_idlflags}")
- foreach(flag ${dol}{flags})
- string(REGEX REPLACE "\\${dol}\\(SolutionDir\\)" "${dol}{OPENRTM_DIR}" flag "${dol}{flag}")
+ foreach(flag ${dol}{rtm_idlflags})
string(REGEX REPLACE "[\\]" "/" flag "${flag}")
list(APPEND OPENRTM_IDLFLAGS "${dol}{flag}")
endforeach()
openrtm-commit メーリングリストの案内