From 06143db33d127cb14df8c19ef15e1992ba5c5b2e Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 15 Nov 2024 11:02:54 +0900 Subject: [PATCH] CMakeLists.txt add install command to work on > catkin config --install > catkin build -vi --summarize we checked that necessary files are installed ``` (export ROS_PACKAGE_PATH=$(pwd)/src; for dir in install/share/*; do pkg=$(basename $dir); echo -e "\n\n$pkg"; echo diff -r install/share/$pkg $(rospack find $pkg) --exclude CMakeLists.txt --exclude .gitignore --exclude setup.py --exclude README.md --exclude CHANGELOG.rst --exclude cmake ; ./check.py $(basename $dir); done > diff.dir) ``` where `check.py` is ``` import sys import os import copy import filecmp import rospkg def compare_directories(install_dir, src_dir, ignore=None): # Initialize dictionaries to store results results = { 'unique_to_dir1': [], 'unique_to_dir2': [], 'differences': [], 'common_files': [] } # Recursively compare directory structures and files comparison = filecmp.dircmp(install_dir, src_dir, ignore=ignore) # Files only in dir1 results['unique_to_dir1'] = comparison.left_only # Files only in dir2 results['unique_to_dir2'] = comparison.right_only # Files present in both directories but different results['differences'] = comparison.diff_files # Files that are identical in both directories results['common_files'] = comparison.same_files return results def list_all_subdirectories(root_dir): subdirectories = [] for dirpath, dirnames, _ in os.walk(root_dir): for dirname in dirnames: subdirectories.append(os.path.join(dirpath, dirname)) return subdirectories if __name__ == '__main__': rospack = rospkg.RosPack() pkg_name = sys.argv[1] pkg_path = rospack.get_path(pkg_name) print("## Check [{}]".format(pkg_name)) for dir in ['.'] + [os.path.relpath(dir, pkg_path) for dir in list_all_subdirectories(pkg_path)]: install_dir = os.path.join('install/share/', pkg_name, dir) src_dir = os.path.join(pkg_path, dir) if os.path.exists(install_dir): differences = compare_directories(install_dir, src_dir, ignore=['env-hooks', 'cmake', '.gitignore', 'CMakeLists.txt', 'CHANGELOG.rst', 'README.md', 'setup.py']) else: print('> Only in {}'.format(src_dir)) continue # Display the results for file in differences['unique_to_dir1']: print("> Files only in directory 1: {}".format([os.path.join(dir, file)])) for file in copy.copy(differences['unique_to_dir2']): if os.path.exists(os.path.join('install/lib/', pkg_name, file)): differences['unique_to_dir2'].remove(file) for file in differences['unique_to_dir2']: print("> Files only in directory 2: {}".format([os.path.join(dir, file)])) for file in differences['differences']: print("> Different files: {}".format([os.path.join(dir, file)])) #print("Common files (identical):", differences['common_files']) ``` ``` --- jsk_aero_robot/aeroeus/CMakeLists.txt | 3 ++- .../jsk_aero_startup/CMakeLists.txt | 2 +- jsk_baxter_robot/baxtereus/CMakeLists.txt | 3 ++- .../jsk_baxter_startup/CMakeLists.txt | 5 +++-- .../jsk_baxter_web/CMakeLists.txt | 2 +- jsk_denso_robot/cobottaeus/CMakeLists.txt | 5 +++-- .../jsk_cobotta_startup/CMakeLists.txt | 6 +++--- .../jsk_fetch_gazebo_demo/CMakeLists.txt | 2 +- .../jsk_fetch_startup/CMakeLists.txt | 10 ++++++++- .../jsk_kinova_startup/CMakeLists.txt | 2 +- jsk_kinova_robot/kinovaeus/CMakeLists.txt | 2 +- .../jsk_magni_startup/CMakeLists.txt | 2 +- .../jsk_nao_startup/CMakeLists.txt | 21 ++++++++++++++++++- .../jsk_pepper_startup/CMakeLists.txt | 12 ++++++++++- jsk_naoqi_robot/naoeus/CMakeLists.txt | 10 +++++++++ jsk_naoqi_robot/peppereus/CMakeLists.txt | 9 +++++++- .../jsk_pr2_calibration/CMakeLists.txt | 4 ++++ jsk_pr2_robot/jsk_pr2_startup/CMakeLists.txt | 4 +++- .../pr2_base_trajectory_action/CMakeLists.txt | 7 ++++++- .../jsk_robot_startup/CMakeLists.txt | 21 +++++++++++++++++-- .../jsk_robot_utils/CMakeLists.txt | 10 ++++++++- .../speak_and_wait_recovery/CMakeLists.txt | 3 +++ .../CMakeLists.txt | 3 +++ .../jsk_unitree_startup/CMakeLists.txt | 10 ++++++++- jsk_unitree_robot/unitreeeus/CMakeLists.txt | 6 ++++-- 25 files changed, 137 insertions(+), 27 deletions(-) diff --git a/jsk_aero_robot/aeroeus/CMakeLists.txt b/jsk_aero_robot/aeroeus/CMakeLists.txt index 38590b4cd4..8f3d7c7127 100644 --- a/jsk_aero_robot/aeroeus/CMakeLists.txt +++ b/jsk_aero_robot/aeroeus/CMakeLists.txt @@ -8,4 +8,5 @@ catkin_package( ## rosrun euscollada collada2eus_urdfmodel $(rospack find aero_description)/robots/aero.urdf $(rospack find aero_description)/robots/aero.yaml aero.l -install(FILES aero-interface.l aero-hand.l aero-wheels.l DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) +file(GLOB LISP_FILES *.l) +install(FILES ${LISP_FILES} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) diff --git a/jsk_aero_robot/jsk_aero_startup/CMakeLists.txt b/jsk_aero_robot/jsk_aero_startup/CMakeLists.txt index 94a9bdf257..9e060e3e0e 100644 --- a/jsk_aero_robot/jsk_aero_startup/CMakeLists.txt +++ b/jsk_aero_robot/jsk_aero_startup/CMakeLists.txt @@ -10,7 +10,7 @@ endif() find_package(catkin REQUIRED) catkin_package() -install(DIRECTORY launch raw_maps scripts +install(DIRECTORY launch raw_maps scripts config test DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) diff --git a/jsk_baxter_robot/baxtereus/CMakeLists.txt b/jsk_baxter_robot/baxtereus/CMakeLists.txt index d75a0e0bc8..5a4e1fe79a 100644 --- a/jsk_baxter_robot/baxtereus/CMakeLists.txt +++ b/jsk_baxter_robot/baxtereus/CMakeLists.txt @@ -65,7 +65,8 @@ install(DIRECTORY euslisp test DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) -install(FILES baxter.l baxter-interface.l baxter-util.l baxter.yaml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) +file(GLOB LISP_FILES *.l) +install(FILES ${LISP_FILES} baxter.yaml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) if(CATKIN_ENABLE_TESTING) find_package(catkin REQUIRED COMPONENTS rostest) diff --git a/jsk_baxter_robot/jsk_baxter_startup/CMakeLists.txt b/jsk_baxter_robot/jsk_baxter_startup/CMakeLists.txt index 51ff998466..f4eb3b6789 100644 --- a/jsk_baxter_robot/jsk_baxter_startup/CMakeLists.txt +++ b/jsk_baxter_robot/jsk_baxter_startup/CMakeLists.txt @@ -17,9 +17,10 @@ include_directories( catkin_add_env_hooks(99.jsk_baxter_startup SHELLS bash zsh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks) -install(DIRECTORY config jsk_baxter_joy jsk_baxter_lifelog jsk_baxter_moveit jsk_baxter_sensors jsk_baxter_tools +install(DIRECTORY config jsk_baxter_joy jsk_baxter_lifelog jsk_baxter_moveit jsk_baxter_sensors jsk_baxter_tools jsk_baxter_description jsk_baxter_machine jsk_baxter_udev DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) -install(FILES baxter.launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) +file(GLOB LAUNCH_FILES *.launch) +install(FILES ${LAUNCH_FILES} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) diff --git a/jsk_baxter_robot/jsk_baxter_web/CMakeLists.txt b/jsk_baxter_robot/jsk_baxter_web/CMakeLists.txt index 9c7072a085..a61eefcd87 100644 --- a/jsk_baxter_robot/jsk_baxter_web/CMakeLists.txt +++ b/jsk_baxter_robot/jsk_baxter_web/CMakeLists.txt @@ -29,6 +29,6 @@ include_directories( ${catkin_INCLUDE_DIRS} ) -install(DIRECTORY launch +install(DIRECTORY launch www DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) diff --git a/jsk_denso_robot/cobottaeus/CMakeLists.txt b/jsk_denso_robot/cobottaeus/CMakeLists.txt index e59ae6d705..ac455f9fb2 100644 --- a/jsk_denso_robot/cobottaeus/CMakeLists.txt +++ b/jsk_denso_robot/cobottaeus/CMakeLists.txt @@ -43,11 +43,12 @@ add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/cobotta.l add_custom_target(compile_cobotta ALL DEPENDS ${PROJECT_SOURCE_DIR}/cobotta.l) -install(DIRECTORY euslisp test +install(DIRECTORY sample test DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) -install(FILES cobotta.l cobotta-interface.l cobotta-util.l cobotta.yaml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) +file(GLOB LISP_FILES *.l) +install(FILES ${LISP_FILES} cobotta.yaml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) if(CATKIN_ENABLE_TESTING) find_package(catkin REQUIRED COMPONENTS rostest) diff --git a/jsk_denso_robot/jsk_cobotta_startup/CMakeLists.txt b/jsk_denso_robot/jsk_cobotta_startup/CMakeLists.txt index 50ceb95ec7..805e919076 100644 --- a/jsk_denso_robot/jsk_cobotta_startup/CMakeLists.txt +++ b/jsk_denso_robot/jsk_cobotta_startup/CMakeLists.txt @@ -33,12 +33,12 @@ catkin_package() ############# ## Install ## ############# -install(DIRECTORY config launch scripts data +install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) -install(FILES jsk_cobotta.machine - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) +# install(FILES jsk_cobotta.machine +# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) ############# ## Testing ## diff --git a/jsk_fetch_robot/jsk_fetch_gazebo_demo/CMakeLists.txt b/jsk_fetch_robot/jsk_fetch_gazebo_demo/CMakeLists.txt index f8ab04eead..319eb6314f 100644 --- a/jsk_fetch_robot/jsk_fetch_gazebo_demo/CMakeLists.txt +++ b/jsk_fetch_robot/jsk_fetch_gazebo_demo/CMakeLists.txt @@ -4,7 +4,7 @@ project(jsk_fetch_gazebo_demo) find_package(catkin) catkin_package() -install(DIRECTORY euslisp launch config +install(DIRECTORY euslisp launch config test DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS ) diff --git a/jsk_fetch_robot/jsk_fetch_startup/CMakeLists.txt b/jsk_fetch_robot/jsk_fetch_startup/CMakeLists.txt index be9259dac6..2e813fb0f8 100644 --- a/jsk_fetch_robot/jsk_fetch_startup/CMakeLists.txt +++ b/jsk_fetch_robot/jsk_fetch_startup/CMakeLists.txt @@ -23,7 +23,15 @@ catkin_add_env_hooks(99.jsk_fetch_startup SHELLS bash zsh sh ############# ## Install ## ############# -install(DIRECTORY config launch scripts data +file(GLOB_RECURSE SCRIPT_PROGRAMS scripts/*) +foreach(SCRIPT_PROGRAM ${SCRIPT_PROGRAMS}) + if("${SCRIPT_PROGRAM}" MATCHES ".*\\.py$") + catkin_install_python(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) + else() + install(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts/) + endif() +endforeach() +install(DIRECTORY config launch data apps euslisp robots supervisor_scripts tmuxinator_yaml udev_rules upstart_scripts DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) diff --git a/jsk_kinova_robot/jsk_kinova_startup/CMakeLists.txt b/jsk_kinova_robot/jsk_kinova_startup/CMakeLists.txt index c0e3d84fbd..c50bda2127 100644 --- a/jsk_kinova_robot/jsk_kinova_startup/CMakeLists.txt +++ b/jsk_kinova_robot/jsk_kinova_startup/CMakeLists.txt @@ -14,7 +14,7 @@ catkin_package() ############# ## Install ## ############# -install(DIRECTORY config launch +install(DIRECTORY config launch scripts DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) diff --git a/jsk_kinova_robot/kinovaeus/CMakeLists.txt b/jsk_kinova_robot/kinovaeus/CMakeLists.txt index b6f51a120b..2ef0ba696f 100644 --- a/jsk_kinova_robot/kinovaeus/CMakeLists.txt +++ b/jsk_kinova_robot/kinovaeus/CMakeLists.txt @@ -67,7 +67,7 @@ install(DIRECTORY test DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) -install(FILES kinova.l kinova-interface.l kinova-util.l DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) +install(FILES kinova.l kinova-interface.l kinova-util.l gen3_robotiq_2f_85.yaml gen3_robotiq_2f_140.yaml gen3_lite_gen3_lite_2f.yaml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) if(CATKIN_ENABLE_TESTING) find_package(catkin REQUIRED COMPONENTS rostest) diff --git a/jsk_magni_robot/jsk_magni_startup/CMakeLists.txt b/jsk_magni_robot/jsk_magni_startup/CMakeLists.txt index 33876c3948..cbf50ad329 100644 --- a/jsk_magni_robot/jsk_magni_startup/CMakeLists.txt +++ b/jsk_magni_robot/jsk_magni_startup/CMakeLists.txt @@ -14,7 +14,7 @@ catkin_package() ############# ## Install ## ############# -install(DIRECTORY launch +install(DIRECTORY launch data DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) diff --git a/jsk_naoqi_robot/jsk_nao_startup/CMakeLists.txt b/jsk_naoqi_robot/jsk_nao_startup/CMakeLists.txt index 4a945f7df0..a708f3dbb8 100644 --- a/jsk_naoqi_robot/jsk_nao_startup/CMakeLists.txt +++ b/jsk_naoqi_robot/jsk_nao_startup/CMakeLists.txt @@ -13,7 +13,7 @@ find_package(catkin REQUIRED COMPONENTS) ## Uncomment this if the package has a setup.py. This macro ensures ## modules and global scripts declared therein get installed ## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html -# catkin_python_setup() +catkin_python_setup() ################################################ ## Declare ROS messages, services and actions ## @@ -130,6 +130,22 @@ include_directories( # LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} # RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} # ) +file(GLOB_RECURSE SCRIPT_PROGRAMS nodes/*) +foreach(SCRIPT_PROGRAM ${SCRIPT_PROGRAMS}) + if("${SCRIPT_PROGRAM}" MATCHES ".*\\.py$") + catkin_install_python(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) + else() + install(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/nodes) + endif() +endforeach() +file(GLOB_RECURSE SCRIPT_PROGRAMS scripts/*) +foreach(SCRIPT_PROGRAM ${SCRIPT_PROGRAMS}) + if("${SCRIPT_PROGRAM}" MATCHES ".*\\.py$") + catkin_install_python(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) + else() + install(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts) + endif() +endforeach() ## Mark cpp header files for installation # install(DIRECTORY include/${PROJECT_NAME}/ @@ -137,6 +153,9 @@ include_directories( # FILES_MATCHING PATTERN "*.h" # PATTERN ".svn" EXCLUDE # ) +install(DIRECTORY launch + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} + USE_SOURCE_PERMISSIONS) ## Mark other files for installation (e.g. launch and bag files, etc.) # install(FILES diff --git a/jsk_naoqi_robot/jsk_pepper_startup/CMakeLists.txt b/jsk_naoqi_robot/jsk_pepper_startup/CMakeLists.txt index 4b9e09ae9f..e25a9339f1 100644 --- a/jsk_naoqi_robot/jsk_pepper_startup/CMakeLists.txt +++ b/jsk_naoqi_robot/jsk_pepper_startup/CMakeLists.txt @@ -3,11 +3,21 @@ project(jsk_pepper_startup) find_package(catkin REQUIRED COMPONENTS) +catkin_python_setup() + catkin_package() -install(DIRECTORY launch nodes sample +install(DIRECTORY launch nodes sample apps config DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) +file(GLOB_RECURSE SCRIPT_PROGRAMS script/*) +foreach(SCRIPT_PROGRAM ${SCRIPT_PROGRAMS}) + if("${SCRIPT_PROGRAM}" MATCHES ".*\\.py$") + catkin_install_python(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) + else() + install(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/script) + endif() +endforeach() if(CATKIN_ENABLE_TESTING AND NOT $ENV{ROS_DISTRO} STREQUAL "hydro") find_package(catkin REQUIRED COMPONENTS rostest roslaunch) diff --git a/jsk_naoqi_robot/naoeus/CMakeLists.txt b/jsk_naoqi_robot/naoeus/CMakeLists.txt index 9457324d22..5a1e382a0c 100644 --- a/jsk_naoqi_robot/naoeus/CMakeLists.txt +++ b/jsk_naoqi_robot/naoeus/CMakeLists.txt @@ -19,3 +19,13 @@ compile_naoqi_model(nao naoV50_generated_urdf) if(nao_meshes_FOUND) add_rostest(test/naoeus.test) endif() + +### +### install +### +install(DIRECTORY patch test launch sample webots euslisp + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} + USE_SOURCE_PERMISSIONS) +file(GLOB LISP_FILES *.l) +install(FILES ${LISP_FILES} nao.yaml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) + diff --git a/jsk_naoqi_robot/peppereus/CMakeLists.txt b/jsk_naoqi_robot/peppereus/CMakeLists.txt index bf179714e7..1889e522e5 100644 --- a/jsk_naoqi_robot/peppereus/CMakeLists.txt +++ b/jsk_naoqi_robot/peppereus/CMakeLists.txt @@ -20,4 +20,11 @@ if(pepper_meshes_FOUND AND CATKIN_ENABLE_TESTING) add_rostest(test/peppereus.test) endif() - +### +### install +### +install(DIRECTORY doc test + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} + USE_SOURCE_PERMISSIONS) +file(GLOB LISP_FILES *.l) +install(FILES ${LISP_FILES} pepper.yaml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) diff --git a/jsk_pr2_robot/jsk_pr2_calibration/CMakeLists.txt b/jsk_pr2_robot/jsk_pr2_calibration/CMakeLists.txt index 73fdf60e27..bc76135f60 100644 --- a/jsk_pr2_robot/jsk_pr2_calibration/CMakeLists.txt +++ b/jsk_pr2_robot/jsk_pr2_calibration/CMakeLists.txt @@ -4,3 +4,7 @@ project(jsk_pr2_calibration) find_package(catkin REQUIRED COMPONENTS) catkin_package() + +install(DIRECTORY scripts + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} + USE_SOURCE_PERMISSIONS) diff --git a/jsk_pr2_robot/jsk_pr2_startup/CMakeLists.txt b/jsk_pr2_robot/jsk_pr2_startup/CMakeLists.txt index b1981968a9..77c3d71a12 100644 --- a/jsk_pr2_robot/jsk_pr2_startup/CMakeLists.txt +++ b/jsk_pr2_robot/jsk_pr2_startup/CMakeLists.txt @@ -9,7 +9,9 @@ catkin_add_env_hooks(99.jsk_pr2_startup SHELLS bash zsh install(DIRECTORY config jsk_pr2_image_transport jsk_pr2_joy jsk_pr2_lifelog jsk_pr2_move_base jsk_pr2_moveit + jsk_pr2_perception jsk_pr2_rocon jsk_pr2_teleop jsk_pr2_sensors jsk_pr2_warning src sample + apps DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) file(GLOB _LAUNCH_FILES ${PROJECT_SOURCE_DIR}/ *.launch) # add / to avoid to get current directory @@ -18,5 +20,5 @@ foreach(_LAUNCH_FILE ${_LAUNCH_FILES}) DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) endforeach() -install(FILES install_pr1040_description.sh jsk_pr2.machine plugin.xml startup.app +install(FILES iai_kitchen.rosinstall jsk_pr2.rosinstall install_pr1040_description.sh jsk_pr2.machine plugin.xml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) diff --git a/jsk_pr2_robot/pr2_base_trajectory_action/CMakeLists.txt b/jsk_pr2_robot/pr2_base_trajectory_action/CMakeLists.txt index 048aa8ed00..43769001c5 100644 --- a/jsk_pr2_robot/pr2_base_trajectory_action/CMakeLists.txt +++ b/jsk_pr2_robot/pr2_base_trajectory_action/CMakeLists.txt @@ -28,7 +28,12 @@ add_executable(pr2_base_trajectory_action src/pr2_base_trajectory_action_controller_node.cpp) target_link_libraries(pr2_base_trajectory_action ${catkin_LIBRARIES} ${Boost_LIBRARIES}) -install(DIRECTORY config include launch +install(DIRECTORY include/${PROJECT_NAME}/ + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} + FILES_MATCHING PATTERN "*.h" +) + +install(DIRECTORY config launch test DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) install(TARGETS pr2_base_trajectory_action diff --git a/jsk_robot_common/jsk_robot_startup/CMakeLists.txt b/jsk_robot_common/jsk_robot_startup/CMakeLists.txt index bf9d8a55cb..a38a661a86 100644 --- a/jsk_robot_common/jsk_robot_startup/CMakeLists.txt +++ b/jsk_robot_common/jsk_robot_startup/CMakeLists.txt @@ -138,18 +138,35 @@ if($ENV{ROS_DISTRO} STRGREATER "indigo") # quadruped_joystick_teleop.cpp uses c+ ) endif() -install(DIRECTORY lifelog util launch images config cfg +install(DIRECTORY include/${PROJECT_NAME}/ + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} + FILES_MATCHING PATTERN "*.h") + +install(DIRECTORY util launch images config cfg euslisp apps DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) + +install(FILES lifelog_nodelet_plugins.xml + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) + file(GLOB_RECURSE SCRIPT_PROGRAMS lifelog/*) foreach(SCRIPT_PROGRAM ${SCRIPT_PROGRAMS}) if("${SCRIPT_PROGRAM}" MATCHES ".*\\.py$") catkin_install_python(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) else() - install(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) + install(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/lifelog) + endif() +endforeach() +file(GLOB_RECURSE SCRIPT_PROGRAMS scripts/*) +foreach(SCRIPT_PROGRAM ${SCRIPT_PROGRAMS}) + if("${SCRIPT_PROGRAM}" MATCHES ".*\\.py$") + catkin_install_python(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) + else() + install(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts) endif() endforeach() + if(mongodb_store_FOUND) install(TARGETS jsk_robot_lifelog ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} diff --git a/jsk_robot_common/jsk_robot_utils/CMakeLists.txt b/jsk_robot_common/jsk_robot_utils/CMakeLists.txt index 5c80baa63b..acb7e736bf 100644 --- a/jsk_robot_common/jsk_robot_utils/CMakeLists.txt +++ b/jsk_robot_common/jsk_robot_utils/CMakeLists.txt @@ -10,7 +10,15 @@ if(CATKIN_ENABLE_TESTING) add_rostest(test/joint_state_compressor.test) endif() -install(DIRECTORY euslisp +file(GLOB_RECURSE SCRIPT_PROGRAMS scripts/*) +foreach(SCRIPT_PROGRAM ${SCRIPT_PROGRAMS}) + if("${SCRIPT_PROGRAM}" MATCHES ".*\\.py$") + catkin_install_python(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) + else() + install(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts) + endif() +endforeach() +install(DIRECTORY euslisp test DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS diff --git a/jsk_robot_common/speak_and_wait_recovery/CMakeLists.txt b/jsk_robot_common/speak_and_wait_recovery/CMakeLists.txt index 1e9db5e7f2..a29626d496 100644 --- a/jsk_robot_common/speak_and_wait_recovery/CMakeLists.txt +++ b/jsk_robot_common/speak_and_wait_recovery/CMakeLists.txt @@ -53,6 +53,9 @@ install(DIRECTORY include/${PROJECT_NAME}/ FILES_MATCHING PATTERN "*.h" ) +install(DIRECTORY launch test + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) + install(FILES speak_and_wait_plugin.xml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ) diff --git a/jsk_robot_common/update_move_base_parameter_recovery/CMakeLists.txt b/jsk_robot_common/update_move_base_parameter_recovery/CMakeLists.txt index c684447081..7e3eefc877 100644 --- a/jsk_robot_common/update_move_base_parameter_recovery/CMakeLists.txt +++ b/jsk_robot_common/update_move_base_parameter_recovery/CMakeLists.txt @@ -61,6 +61,9 @@ install(DIRECTORY include/${PROJECT_NAME}/ FILES_MATCHING PATTERN "*.h" ) +install(DIRECTORY config launch tests worlds + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) + install(FILES update_move_base_parameter_recovery_plugins.xml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ) diff --git a/jsk_unitree_robot/jsk_unitree_startup/CMakeLists.txt b/jsk_unitree_robot/jsk_unitree_startup/CMakeLists.txt index e7595dd01f..6b1c3d909a 100644 --- a/jsk_unitree_robot/jsk_unitree_startup/CMakeLists.txt +++ b/jsk_unitree_robot/jsk_unitree_startup/CMakeLists.txt @@ -14,7 +14,15 @@ catkin_package() ############# ## Install ## ############# -install(DIRECTORY config launch +file(GLOB_RECURSE SCRIPT_PROGRAMS scripts/*) +foreach(SCRIPT_PROGRAM ${SCRIPT_PROGRAMS}) + if("${SCRIPT_PROGRAM}" MATCHES ".*\\.py$") + catkin_install_python(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) + else() + install(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts) + endif() +endforeach() +install(DIRECTORY config launch apps autostart ino DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) diff --git a/jsk_unitree_robot/unitreeeus/CMakeLists.txt b/jsk_unitree_robot/unitreeeus/CMakeLists.txt index ad64f874f6..f541e2a509 100644 --- a/jsk_unitree_robot/unitreeeus/CMakeLists.txt +++ b/jsk_unitree_robot/unitreeeus/CMakeLists.txt @@ -44,12 +44,14 @@ foreach(ROBOT_TYPE go1) add_custom_target(compile_${ROBOT_TYPE} ALL DEPENDS ${PROJECT_SOURCE_DIR}/${ROBOT_TYPE}.l ${PROJECT_SOURCE_DIR}/${ROBOT_TYPE}-simple.l) endforeach() - +### +### install +### install(DIRECTORY test DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) -install(FILES go1.l unitree-interface.l go1-utils.l DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) +install(FILES go1.l unitree-interface.l go1-utils.l go1.yaml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) if(CATKIN_ENABLE_TESTING) find_package(catkin REQUIRED COMPONENTS rostest)