[openrtm-commit:00988] r413 - trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2013-02-06 22:20:29 +0900 (Wed, 06 Feb 2013)
New Revision: 413

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
Log:
Reverted r377 modification from r376 has been recovered.

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	2013-02-05 16:46:18 UTC (rev 412)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl	2013-02-06 13:20:29 UTC (rev 413)
@@ -15,20 +15,21 @@
 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}{comp_headers} ${dol}{ALL_IDL_SRCS})
+add_library(${dol}{PROJECT_NAME} ${dol}{LIB_TYPE} ${dol}{comp_srcs} ${dol}{comp_headers} ${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_LOWER}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)
     
\ No newline at end of file