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

[openrtm ＠ openrtm.org]

Author: ga
Date: 2017-03-04 23:54:12 +0900 (Sat, 04 Mar 2017)
New Revision: 695

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/src/SrcCMakeLists.txt.vsl
Log:
Modified generated CMakeFile for DEB/RPM Packaging #3601

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-03-01 02:08:05 UTC (rev 694)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cpack_options_cmake.in.vsl	2017-03-04 14:54:12 UTC (rev 695)
@@ -1,4 +1,5 @@
 set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
+set(CPACK_RPM_PACKAGE_NAME "@PROJECT_NAME@")
 set(CPACK_PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
 set(CPACK_PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
 set(CPACK_PACKAGE_VERSION_PATCH "@PROJECT_VERSION_REVISION@")

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl	2017-03-01 02:08:05 UTC (rev 694)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl	2017-03-04 14:54:12 UTC (rev 695)
@@ -52,6 +52,6 @@
 
 install(TARGETS ${dol}{PROJECT_NAME} ${dol}{PROJECT_NAME}Comp
     EXPORT ${dol}{PROJECT_NAME}
-    RUNTIME DESTINATION ${dol}{INSTALL_DIR} COMPONENT component
-    LIBRARY DESTINATION ${dol}{INSTALL_DIR} COMPONENT component
-    ARCHIVE DESTINATION ${dol}{INSTALL_DIR} COMPONENT component)
+    RUNTIME DESTINATION ${dol}{INSTALL_PREFIX} COMPONENT component
+    LIBRARY DESTINATION ${dol}{INSTALL_PREFIX} COMPONENT component
+    ARCHIVE DESTINATION ${dol}{INSTALL_PREFIX} COMPONENT component)