Merge pull request moveit#620 from iirob/pr-create_ikfast_moveit_plug…

…in-fix create_ikfast_moveit_plugin: fixed directory variable for templates that were moved to ikfast_kinematics_plugin
otamachan · Oct 18, 2017 · 487a0b5 · 487a0b5
2 parents 6d75391 + 88e2378
commit 487a0b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/moveit_kinematics/ikfast_kinematics_plugin/CMakeLists.txt b/moveit_kinematics/ikfast_kinematics_plugin/CMakeLists.txt
@@ -16,5 +16,5 @@ install(
   DIRECTORY
     templates
   DESTINATION
-    ${CATKIN_PACKAGE_SHARE_DESTINATION}
+    ${CATKIN_PACKAGE_SHARE_DESTINATION}/ikfast_kinematics_plugin
 )
diff --git a/moveit_kinematics/ikfast_kinematics_plugin/scripts/create_ikfast_moveit_plugin.py b/moveit_kinematics/ikfast_kinematics_plugin/scripts/create_ikfast_moveit_plugin.py
@@ -52,6 +52,7 @@
 import shutil
 
 plugin_gen_pkg = 'moveit_kinematics'  # package containing this file
+plugin_sub_dir = 'ikfast_kinematics_plugin' # sub directory which contains the template directory
 # Allowed search modes, see SEARCH_MODE enum in template file
 search_modes = ['OPTIMIZE_MAX_JOINT', 'OPTIMIZE_FREE_JOINT' ]
 
@@ -181,7 +182,7 @@
 
    # Get template folder location
    try:
-      plugin_gen_dir = roslib.packages.get_pkg_dir(plugin_gen_pkg)
+      plugin_gen_dir = os.path.join(roslib.packages.get_pkg_dir(plugin_gen_pkg), plugin_sub_dir)
    except:
       print '\nERROR: can\'t find package '+plugin_gen_pkg+' \n'
       sys.exit(-1)