sugarsweetrobotics · Kanamura24 · Oct 18, 2018
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,9 +40,9 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 set(BIN_INSTALL_DIR "components/bin")
 set(LIB_INSTALL_DIR "components/lib")
 set(INC_INSTALL_DIR
-    "components/include/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+    "components/include/${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}")
 set(SHARE_INSTALL_DIR
-    "components/share/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}")
+    "components/share/${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}")
 
 # Get necessary dependency information
 find_package(OpenRTM)
@@ -94,8 +94,8 @@ IF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
 SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
 ENDIF()
 include(InstallRequiredSystemLibraries)
-set(PROJECT_EXECUTABLES ${PROJECT_NAME_LOWER}Comp
-    "${PROJECT_NAME_LOWER}Comp")
+set(PROJECT_EXECUTABLES ${PROJECT_NAME}Comp
+    "${PROJECT_NAME}Comp")
 
 set(cpack_options "${PROJECT_BINARY_DIR}/cpack_options.cmake")
 

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,17 +1,17 @@
 set(PKG_DEPS "openrtm-aist")
-set(PKG_LIBS -l${PROJECT_NAME_LOWER})
-set(pkg_conf_file ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}.pc)
-configure_file(${PROJECT_NAME_LOWER}.pc.in ${pkg_conf_file} @ONLY)
+set(PKG_LIBS -l${PROJECT_NAME})
+set(pkg_conf_file ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc)
+configure_file(${PROJECT_NAME}.pc.in ${pkg_conf_file} @ONLY)
 install(FILES ${pkg_conf_file}
     DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ COMPONENT component)
 
 # Install CMake modules
-set(cmake_config ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config.cmake)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME_LOWER}-config.cmake.in
+set(cmake_config ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-config.cmake.in
     ${cmake_config} @ONLY)
 set(cmake_version_config
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-config-version.cmake.in
     ${cmake_version_config} @ONLY)
 set(cmake_mods ${cmake_config} ${cmake_version_config})
 install(FILES ${cmake_mods} DESTINATION ${SHARE_INSTALL_DIR} COMPONENT library)

diff --git a/cmake/WebCamera-config.cmake.in b/cmake/WebCamera-config.cmake.in
@@ -18,12 +18,12 @@ set(WebCamera_FOUND TRUE)
 find_package(<dependency> REQUIRED)
 
 #set(WebCamera_INCLUDE_DIRS
-#    "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME_LOWER@-@PROJECT_VERSION_MAJOR@"
+#    "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME@-@PROJECT_VERSION_MAJOR@"
 #    ${<dependency>_INCLUDE_DIRS}
 #    )
 #
 #set(WebCamera_IDL_DIRS
-#    "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME_LOWER@-@PROJECT_VERSION_MAJOR@/idl")
+#    "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME@-@PROJECT_VERSION_MAJOR@/idl")
 set(WebCamera_INCLUDE_DIRS
     "@CMAKE_INSTALL_PREFIX@/include/@CPACK_PACKAGE_FILE_NAME@"
     ${<dependency>_INCLUDE_DIRS}
@@ -34,12 +34,12 @@ set(WebCamera_IDL_DIRS
 
 if(WIN32)
     set(WebCamera_LIBRARIES
-        "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@@PROJECT_NAME_LOWER@@CMAKE_STATIC_LIBRARY_SUFFIX@"
+        "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@@PROJECT_NAME@@CMAKE_STATIC_LIBRARY_SUFFIX@"
         ${<dependency>_LIBRARIES}
         )
 else(WIN32)
     set(WebCamera_LIBRARIES
-        "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@@PROJECT_NAME_LOWER@@CMAKE_SHARED_LIBRARY_SUFFIX@"
+        "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@@PROJECT_NAME@@CMAKE_SHARED_LIBRARY_SUFFIX@"
         ${<dependency>_LIBRARIES}
         )
 endif(WIN32)

diff --git a/cmake/WebCamera.pc.in b/cmake/WebCamera.pc.in
@@ -9,5 +9,5 @@ Description: @PROJECT_DESCRIPTION@
 Version: @PROJECT_VERSION@
 Requires: @PKG_DEPS@
 Libs: -L${libdir} @PKG_LIBS@
-Cflags: -I${includedir}/@PROJECT_NAME_LOWER@-@PROJECT_VERSION_MAJOR@
+Cflags: -I${includedir}/@PROJECT_NAME@-@PROJECT_VERSION_MAJOR@
 
diff --git a/cmake/cpack_options.cmake.in b/cmake/cpack_options.cmake.in
@@ -77,18 +77,18 @@ IF (WIN32)
     set(CPACK_PACKAGE_EXECUTABLES @PROJECT_EXECUTABLES@)
     if(INSTALL_DOCUMENTATION)
         set(CPACK_NSIS_MENU_LINKS
-            "@CMAKE_INSTALL_PREFIX@/share/doc/@PROJECT_NAME_LOWER@-@PROJECT_VERSION_MAJOR@/html/index.html"
+            "@CMAKE_INSTALL_PREFIX@/share/doc/@PROJECT_NAME@-@PROJECT_VERSION_MAJOR@/html/index.html"
             "Component documentation")
     endif(INSTALL_DOCUMENTATION)
     string(REPLACE "/@PROJECT_NAME@" "" install_prefix_root
         "@CMAKE_INSTALL_PREFIX@")
     file(TO_NATIVE_PATH "${install_prefix_root}" install_prefix_root)
     set(CPACK_NSIS_INSTALL_ROOT "${install_prefix_root}")
     set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
-        "  Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER@-@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER@-config.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER@-config.cmake\"
-  Rename \"$INSTDIR\\share\\@PROJECT_NAME_LOWER@-@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER@-config-version.cmake\" \"$INSTDIR\\@PROJECT_NAME_LOWER@-config-version.cmake\"")
+        "  Rename \"$INSTDIR\\share\\@PROJECT_NAME@-@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME@-config.cmake\" \"$INSTDIR\\@PROJECT_NAME@-config.cmake\"
+  Rename \"$INSTDIR\\share\\@PROJECT_NAME@-@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME@-config-version.cmake\" \"$INSTDIR\\@PROJECT_NAME@-config-version.cmake\"")
     set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
-        "  Delete \"$INSTDIR\\@PROJECT_NAME_LOWER@-config.cmake\"
-  Delete \"$INSTDIR\\@PROJECT_NAME_LOWER@-config-version.cmake\"")
+        "  Delete \"$INSTDIR\\@PROJECT_NAME@-config.cmake\"
+  Delete \"$INSTDIR\\@PROJECT_NAME@-config-version.cmake\"")
 ENDIF (WIN32)
 
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -29,7 +29,7 @@ if(DOXYGEN_FOUND)
     #    ${CMAKE_CURRENT_SOURCE_DIR}/content ${CMAKE_CURRENT_BINARY_DIR}/html
     #    DEPENDS doxygen_doc)
     #install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html" DESTINATION
-    #    "components/share/doc/${PROJECT_NAME_LOWER}-${PROJECT_VERSION_MAJOR}"
+    #    "components/share/doc/${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}"
     #    COMPONENT documentation)
 else(DOXYGEN_FOUND)
     message(FATAL_ERROR

diff --git a/doc/doxyfile.in b/doc/doxyfile.in
@@ -154,8 +154,8 @@ HTML_ALIGN_MEMBERS     = YES
 HTML_DYNAMIC_SECTIONS  = NO
 GENERATE_DOCSET        = YES
 DOCSET_FEEDNAME        = "Doxygen generated docs"
-DOCSET_BUNDLE_ID       = @PROJECT_NAME_LOWER@.@PROJECT_AUTHOR_SHORT@
-DOCSET_PUBLISHER_ID    = @PROJECT_NAME_LOWER@.@[email protected]
+DOCSET_BUNDLE_ID       = @PROJECT_NAME@.@PROJECT_AUTHOR_SHORT@
+DOCSET_PUBLISHER_ID    = @PROJECT_NAME@.@[email protected]
 DOCSET_PUBLISHER_NAME  = @PROJECT_AUTHOR@/@PROJECT_VENDOR@
 GENERATE_HTMLHELP      = YES
 CHM_FILE               = "@PROJECT_NAME@-@PROJECT_VERSION_MAJOR@.@[email protected]"
@@ -166,14 +166,14 @@ BINARY_TOC             = NO
 TOC_EXPAND             = NO
 GENERATE_QHP           = NO
 QCH_FILE               = 
-QHP_NAMESPACE          = @PROJECT_NAME_LOWER@.@[email protected]
+QHP_NAMESPACE          = @PROJECT_NAME@.@[email protected]
 QHP_VIRTUAL_FOLDER     = doc
 QHP_CUST_FILTER_NAME   = 
 QHP_CUST_FILTER_ATTRS  = 
 QHP_SECT_FILTER_ATTRS  = 
 QHG_LOCATION           = 
 GENERATE_ECLIPSEHELP   = NO
-ECLIPSE_DOC_ID         = @PROJECT_NAME_LOWER@.@[email protected]
+ECLIPSE_DOC_ID         = @PROJECT_NAME@.@[email protected]
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 4
 GENERATE_TREEVIEW      = NO

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
@@ -32,6 +32,7 @@ macro(_COMPILE_IDL _idl_file)
         DEPENDS ${_idl_file}
         COMMENT "Compiling ${_idl_file}" VERBATIM)
     add_custom_target(${_idl}_TGT DEPENDS ${${_idl_srcs_var}})
+
     set(ALL_IDL_SRCS ${ALL_IDL_SRCS} ${${_idl_srcs_var}})
     if(NOT TARGET ALL_IDL_TGT)
         add_custom_target(ALL_IDL_TGT)
@@ -51,6 +52,6 @@ OPENRTM_COMPILE_IDL_FILES(${idls})
 set(ALL_IDL_SRCS ${ALL_IDL_SRCS} PARENT_SCOPE)
 FILTER_LIST(ALL_IDL_SRCS "hh$" idl_headers)
 install(FILES ${idl_headers}
-    DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}/idl
+    DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME}/idl
     COMPONENT headers)
 
diff --git a/include/WebCamera/CMakeLists.txt b/include/WebCamera/CMakeLists.txt
@@ -3,6 +3,6 @@ set(hdrs WebCamera.h
     ImgSVC_impl.h
     )
 
-install(FILES ${hdrs} DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME_LOWER}
+install(FILES ${hdrs} DESTINATION ${INC_INSTALL_DIR}/${PROJECT_NAME}
     COMPONENT library)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -45,11 +45,15 @@ add_library(${PROJECT_NAME} ${LIB_TYPE} ${comp_srcs}
   ${comp_headers} ${ALL_IDL_SRCS})
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
 set_source_files_properties(${ALL_IDL_SRCS} PROPERTIES GENERATED 1)
+if(NOT TARGET ALL_IDL_TGT)
+  add_custom_target(ALL_IDL_TGT)
+endif(NOT TARGET ALL_IDL_TGT)
 add_dependencies(${PROJECT_NAME} ALL_IDL_TGT)
 target_link_libraries(${PROJECT_NAME} ${OPENRTM_LIBRARIES} ${OpenCV_LIBRARIES})
 
 add_executable(${PROJECT_NAME}Comp ${standalone_srcs}
   ${comp_srcs} ${comp_headers} ${ALL_IDL_SRCS})
+add_dependencies(${PROJECT_NAME}Comp ALL_IDL_TGT)
 target_link_libraries(${PROJECT_NAME}Comp ${OPENRTM_LIBRARIES} ${OpenCV_LIBS})
 
 install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}Comp