[openrtm-commit:02811] r765 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake: . cmake

[openrtm ＠ openrtm.org]

Author: ga
Date: 2017-09-06 22:49:42 +0900 (Wed, 06 Sep 2017)
New Revision: 765

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cpack_options_cmake.in.vsl
Log:
Modified CMakeLists.txt, cmake/cpack_options.cmake.in #4170

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl	2017-08-30 01:34:44 UTC (rev 764)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl	2017-09-06 13:49:42 UTC (rev 765)
@@ -11,6 +11,7 @@
 string(TOLOWER ${dol}{PROJECT_NAME} PROJECT_NAME_LOWER)
 include("${dol}{PROJECT_SOURCE_DIR}/cmake/utils.cmake")
 set(PROJECT_VERSION ${rtcParam.version} CACHE STRING "${rtcParam.name} version")
+set(UPGRADE_GUID "")
 DISSECT_VERSION()
 set(PROJECT_SHORT_VER ${dol}{PROJECT_VERSION_MAJOR}${dol}{PROJECT_VERSION_MINOR}${dol}{PROJECT_VERSION_REVISION})
 set(PROJECT_DESCRIPTION "${rtcParam.description}")

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cpack_options_cmake.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cpack_options_cmake.in.vsl	2017-08-30 01:34:44 UTC (rev 764)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cpack_options_cmake.in.vsl	2017-09-06 13:49:42 UTC (rev 765)
@@ -69,6 +69,7 @@
     ${sharp} Windows WiX package settings
     if(${dol}{CPACK_GENERATOR} MATCHES "WIX")
       set(CPACK_WIX_CULTURES "ja-jp")
+      set(CPACK_WIX_UPGRADE_GUID @UPGRADE_GUID@)
       set(CPACK_WIX_PRODUCT_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
       set(CPACK_WIX_UI_BANNER "@PROJECT_SOURCE_DIR@/cmake/rt_middleware_banner.bmp")
       set(CPACK_WIX_UI_DIALOG "@PROJECT_SOURCE_DIR@/cmake/rt_middleware_dlg.bmp")