[openrtm-commit:00997] r420 - in branches/RELENG_1_1/rtmtools: . jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2013-02-11 10:54:09 +0900 (Mon, 11 Feb 2013)
New Revision: 420

Modified:
   branches/RELENG_1_1/rtmtools/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
Log:
merged 419


Property changes on: branches/RELENG_1_1/rtmtools
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/rtmtools:166-393,395-396,398,400,402,404,406-407,409-411,413-417
   + /trunk/rtmtools:166-393,395-396,398,400,402,404,406-407,409-411,413-417,419

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl	2013-02-09 09:46:44 UTC (rev 419)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl	2013-02-11 01:54:09 UTC (rev 420)
@@ -85,6 +85,10 @@
 endif(BUILD_SOURCES)
 
 ${sharp} Package creation
+${sharp} By default, do not warn when built on machines using only VS Express:
+IF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
+SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
+ENDIF()
 include(InstallRequiredSystemLibraries)
 set(PROJECT_EXECUTABLES ${dol}{PROJECT_NAME_LOWER}Comp
     "${dol}{PROJECT_NAME_LOWER}Comp")