Skip to content

Commit

Permalink
CMakeLists.txt add install command to work on
Browse files Browse the repository at this point in the history
> 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'])

```

```
  • Loading branch information
k-okada committed Nov 15, 2024
1 parent 25dd087 commit 1398b88
Show file tree
Hide file tree
Showing 27 changed files with 155 additions and 27 deletions.
3 changes: 2 additions & 1 deletion jsk_aero_robot/aeroeus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion jsk_aero_robot/jsk_aero_startup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 2 additions & 1 deletion jsk_baxter_robot/baxtereus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions jsk_baxter_robot/jsk_baxter_startup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

2 changes: 1 addition & 1 deletion jsk_baxter_robot/jsk_baxter_web/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ include_directories(
${catkin_INCLUDE_DIRS}
)

install(DIRECTORY launch
install(DIRECTORY launch www
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
USE_SOURCE_PERMISSIONS)
5 changes: 3 additions & 2 deletions jsk_denso_robot/cobottaeus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions jsk_denso_robot/jsk_cobotta_startup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##
Expand Down
2 changes: 1 addition & 1 deletion jsk_fetch_robot/jsk_fetch_gazebo_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
10 changes: 9 additions & 1 deletion jsk_fetch_robot/jsk_fetch_startup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion jsk_kinova_robot/jsk_kinova_startup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ catkin_package()
#############
## Install ##
#############
install(DIRECTORY config launch
install(DIRECTORY config launch scripts
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
USE_SOURCE_PERMISSIONS)

Expand Down
2 changes: 1 addition & 1 deletion jsk_kinova_robot/kinovaeus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion jsk_magni_robot/jsk_magni_startup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ catkin_package()
#############
## Install ##
#############
install(DIRECTORY launch
install(DIRECTORY launch data
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
USE_SOURCE_PERMISSIONS)

Expand Down
21 changes: 20 additions & 1 deletion jsk_naoqi_robot/jsk_nao_startup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##
Expand Down Expand Up @@ -130,13 +130,32 @@ 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}/
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
# 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
Expand Down
9 changes: 9 additions & 0 deletions jsk_naoqi_robot/jsk_nao_startup/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD

from distutils.core import setup
from catkin_pkg.python_setup import generate_distutils_setup

# fetch values from package.xml
setup_args = generate_distutils_setup()

setup(**setup_args)
12 changes: 11 additions & 1 deletion jsk_naoqi_robot/jsk_pepper_startup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 9 additions & 0 deletions jsk_naoqi_robot/jsk_pepper_startup/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD

from distutils.core import setup
from catkin_pkg.python_setup import generate_distutils_setup

# fetch values from package.xml
setup_args = generate_distutils_setup()

setup(**setup_args)
10 changes: 10 additions & 0 deletions jsk_naoqi_robot/naoeus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

9 changes: 8 additions & 1 deletion jsk_naoqi_robot/peppereus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
4 changes: 4 additions & 0 deletions jsk_pr2_robot/jsk_pr2_calibration/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 3 additions & 1 deletion jsk_pr2_robot/jsk_pr2_startup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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})
7 changes: 6 additions & 1 deletion jsk_pr2_robot/pr2_base_trajectory_action/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 19 additions & 2 deletions jsk_robot_common/jsk_robot_startup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
10 changes: 9 additions & 1 deletion jsk_robot_common/jsk_robot_utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions jsk_robot_common/speak_and_wait_recovery/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)
Expand Down
10 changes: 9 additions & 1 deletion jsk_unitree_robot/jsk_unitree_startup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 4 additions & 2 deletions jsk_unitree_robot/unitreeeus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 1398b88

Please sign in to comment.