[openrtm-commit:03372] r3444 - in trunk/OpenRTM-aist/utils: rtc-template rtm-skelwrapper

openrtm @ openrtm.org openrtm @ openrtm.org
2018年 11月 15日 (木) 15:13:50 JST


Author: miyamoto
Date: 2018-11-15 15:13:49 +0900 (Thu, 15 Nov 2018)
New Revision: 3444

Modified:
   trunk/OpenRTM-aist/utils/rtc-template/CMakeLists.txt
   trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt
Log:
[compat, cmake]

Modified: trunk/OpenRTM-aist/utils/rtc-template/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtc-template/CMakeLists.txt	2018-11-15 06:06:37 UTC (rev 3443)
+++ trunk/OpenRTM-aist/utils/rtc-template/CMakeLists.txt	2018-11-15 06:13:49 UTC (rev 3444)
@@ -1,5 +1,8 @@
 cmake_minimum_required (VERSION 2.6)
 
 
-
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rtc-template DESTINATION ${INSTALL_RTM_BIN_DIR})
+if(UNIX)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rtc-template DESTINATION ${INSTALL_RTM_BIN_DIR})
+elseif(MSVC)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rtc-template DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
+endif(UNIX)
\ No newline at end of file

Modified: trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt	2018-11-15 06:06:37 UTC (rev 3443)
+++ trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt	2018-11-15 06:13:49 UTC (rev 3444)
@@ -6,7 +6,7 @@
 	install(FILES skel_wrapper.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
 elseif(MSVC)
 	configure_file(rtm-skelwrapper ${PROJECT_BINARY_DIR}/rtm-skelwrapper.py COPYONLY)
-	install(FILES ${PROJECT_BINARY_DIR}/rtm-skelwrapper.py DESTINATION ${INSTALL_RTM_BIN_DIR})
+	install(FILES ${PROJECT_BINARY_DIR}/rtm-skelwrapper.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
 endif(UNIX)
 
 



openrtm-commit メーリングリストの案内