[openrtm-commit:00934] r376 - trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src
openrtm @ openrtm.org
openrtm @ openrtm.org
2013年 1月 7日 (月) 23:12:21 JST
Author: n-ando
Date: 2013-01-07 23:12:21 +0900 (Mon, 07 Jan 2013)
New Revision: 376
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
Log:
Lower case names of loadable module/standalone RTC have been modified to original name. refs #2556
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 2012-12-05 13:00:29 UTC (rev 375)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl 2013-01-07 14:12:21 UTC (rev 376)
@@ -13,20 +13,20 @@
link_directories(${dol}{OPENRTM_LIBRARY_DIRS})
link_directories(${dol}{OMNIORB_LIBRARY_DIRS})
-add_library(${dol}{PROJECT_NAME_LOWER} ${dol}{LIB_TYPE} ${dol}{comp_srcs} ${dol}{ALL_IDL_SRCS})
+add_library(${dol}{PROJECT_NAME} ${dol}{LIB_TYPE} ${dol}{comp_srcs} ${dol}{ALL_IDL_SRCS})
+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
set_source_files_properties(${dol}{ALL_IDL_SRCS} PROPERTIES GENERATED 1)
-add_dependencies(${dol}{PROJECT_NAME_LOWER} ALL_IDL_TGT)
-target_link_libraries(${dol}{PROJECT_NAME_LOWER} ${dol}{OPENRTM_LIBRARIES})
+add_dependencies(${dol}{PROJECT_NAME} ALL_IDL_TGT)
+target_link_libraries(${dol}{PROJECT_NAME} ${dol}{OPENRTM_LIBRARIES})
-add_executable(${dol}{PROJECT_NAME_LOWER}comp ${dol}{standalone_srcs})
-target_link_libraries(${dol}{PROJECT_NAME_LOWER}comp ${dol}{PROJECT_NAME_LOWER})
+add_executable(${dol}{PROJECT_NAME}Comp ${dol}{standalone_srcs})
+target_link_libraries(${dol}{PROJECT_NAME}Comp ${dol}{PROJECT_NAME})
-install(TARGETS ${dol}{PROJECT_NAME_LOWER} ${dol}{PROJECT_NAME_LOWER}comp
- EXPORT ${dol}{PROJECT_NAME_LOWER}
+install(TARGETS ${dol}{PROJECT_NAME} ${dol}{PROJECT_NAME}Comp
+ EXPORT ${dol}{PROJECT_NAME}
RUNTIME DESTINATION ${dol}{BIN_INSTALL_DIR} COMPONENT component
LIBRARY DESTINATION ${dol}{LIB_INSTALL_DIR} COMPONENT component
ARCHIVE DESTINATION ${dol}{LIB_INSTALL_DIR} COMPONENT component)
-install(EXPORT ${dol}{PROJECT_NAME_LOWER}
- DESTINATION ${dol}{LIB_INSTALL_DIR}/${dol}{PROJECT_NAME_LOWER}
- FILE ${dol}{PROJECT_NAME_LOWER}Depends.cmake)
-
+install(EXPORT ${dol}{PROJECT_NAME}
+ DESTINATION ${dol}{LIB_INSTALL_DIR}/${dol}{PROJECT_NAME}
+ FILE ${dol}{PROJECT_NAME}Depends.cmake)
More information about the openrtm-commit
mailing list