[openrtm-commit:02490] r693 - 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-01 11:04:15 +0900 (Wed, 01 Mar 2017)
New Revision: 693

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-02-21 03:40:01 UTC (rev 692)
+++ 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:04:15 UTC (rev 693)
@@ -5,7 +5,12 @@
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
 set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+   set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")		 
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+   set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
 set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
 
 set(CPACK_COMPONENTS_ALL component)
@@ -90,5 +95,8 @@
     set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
         "  Delete \"${dol}INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
   Delete \"${dol}INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
 ENDIF (WIN32)
-

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-02-21 03:40:01 UTC (rev 692)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl	2017-03-01 02:04:15 UTC (rev 693)
@@ -52,31 +52,6 @@
 
 install(TARGETS ${dol}{PROJECT_NAME} ${dol}{PROJECT_NAME}Comp
     EXPORT ${dol}{PROJECT_NAME}
-    RUNTIME DESTINATION ${dol}{INSTALL_PREFIX} COMPONENT component
-    LIBRARY DESTINATION ${dol}{INSTALL_PREFIX} COMPONENT component
-    ARCHIVE DESTINATION ${dol}{INSTALL_PREFIX} COMPONENT component)
-    
-if (SolutionDir)
- if (MSVC)
-   add_custom_command(
-     TARGET ${dol}{PROJECT_NAME}
-     POST_BUILD
-     COMMAND ${dol}{CMAKE_COMMAND} -E
-       copy ${dol}{PROJECT_BINARY_DIR}/src/Release/${dol}{PROJECT_NAME}.dll ${dol}{SolutionDir}/bin
-   )
-   add_custom_command(
-     TARGET ${dol}{PROJECT_NAME}Comp
-     POST_BUILD
-     COMMAND ${dol}{CMAKE_COMMAND} -E
-       copy ${dol}{PROJECT_BINARY_DIR}/src/Release/${dol}{PROJECT_NAME}Comp.exe ${dol}{SolutionDir}/bin
-   )
-		 
- else (MSVC)
-   add_custom_command(
-     TARGET ${dol}{PROJECT_NAME}Comp
-     POST_BUILD
-     COMMAND ${dol}{CMAKE_COMMAND} -E
-       copy ${dol}{PROJECT_BINARY_DIR}/src/${dol}{PROJECT_NAME}Comp ${dol}{SolutionDir}/bin
-   )
- endif (MSVC)
-endif (SolutionDir)
+    RUNTIME DESTINATION ${dol}{INSTALL_DIR} COMPONENT component
+    LIBRARY DESTINATION ${dol}{INSTALL_DIR} COMPONENT component
+    ARCHIVE DESTINATION ${dol}{INSTALL_DIR} COMPONENT component)