From bf3c24520521cddd347b41ad8ea2fa4d73bccfe6 Mon Sep 17 00:00:00 2001 From: Max DeSantis Date: Wed, 8 Jan 2025 23:53:55 +0000 Subject: [PATCH] Include task composer in .run-cpack, fix typos in CMakeLists --- .run-cpack | 2 +- tesseract_motion_planners/descartes/CMakeLists.txt | 4 ++-- tesseract_task_composer/planning/CMakeLists.txt | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.run-cpack b/.run-cpack index cea29e8f631..7d9ece3e237 100755 --- a/.run-cpack +++ b/.run-cpack @@ -20,7 +20,7 @@ echo " artifact_dir: $artifact_dir" echo " artifact_ext: $artifact_ext" echo " build_dir: $build_dir" -declare -a StringArray=("tesseract_command_language" "tesseract_time_parameterization" "tesseract_motion_planners" "tesseract_process_managers") +declare -a StringArray=("tesseract_command_language" "tesseract_time_parameterization" "tesseract_motion_planners" "tesseract_process_managers" "tesseract_task_composer") # Iterate the packages using for loop for val in ${StringArray[@]}; do diff --git a/tesseract_motion_planners/descartes/CMakeLists.txt b/tesseract_motion_planners/descartes/CMakeLists.txt index e7626c99338..6443f5cbd7b 100644 --- a/tesseract_motion_planners/descartes/CMakeLists.txt +++ b/tesseract_motion_planners/descartes/CMakeLists.txt @@ -57,7 +57,7 @@ if(TESSERACT_PACKAGE) DESCRIPTION "Tesseract motion planners descartes components" COMPONENT_DEPENDS core simple LINUX_DEPENDS "${TESSERACT_PACKAGE_PREFIX}tesseract-collision-core" - "${TESSERACT_PACKAGE_PREFIX}tesseract-descartes-core" + "${TESSERACT_PACKAGE_PREFIX}descartes-light-core" WINDOWS_DEPENDS "${TESSERACT_PACKAGE_PREFIX}tesseract-collision-core" - "${TESSERACT_PACKAGE_PREFIX}tesseract-descartes-core") + "${TESSERACT_PACKAGE_PREFIX}descartes-light-core") endif() diff --git a/tesseract_task_composer/planning/CMakeLists.txt b/tesseract_task_composer/planning/CMakeLists.txt index 7b587595716..ee0fc59243b 100644 --- a/tesseract_task_composer/planning/CMakeLists.txt +++ b/tesseract_task_composer/planning/CMakeLists.txt @@ -58,7 +58,7 @@ set(LINUX_DEPENDS "${TESSERACT_PACKAGE_PREFIX}tesseract-command-language" "${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-core" "${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-simple" - "${TESSERACT_PACKAGE_PREFIX}tesseract-time-parameterizaton-core") + "${TESSERACT_PACKAGE_PREFIX}tesseract-time-parameterization-core") set(WINDOWS_DEPENDS "console-bridge" @@ -68,7 +68,7 @@ set(WINDOWS_DEPENDS "${TESSERACT_PACKAGE_PREFIX}tesseract-command-language" "${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-core" "${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-simple" - "${TESSERACT_PACKAGE_PREFIX}tesseract-time-parameterizaton-core") + "${TESSERACT_PACKAGE_PREFIX}tesseract-time-parameterization-core") if(tesseract_motion_planners_trajopt_FOUND) list(APPEND FACTORIES_SOURCE_FILES src/factories/planning_task_composer_trajopt_plugin_factory.cpp) @@ -94,8 +94,8 @@ endif() if(tesseract_motion_planners_trajopt_ifopt_FOUND) list(APPEND FACTORIES_SOURCE_FILES src/factories/planning_task_composer_trajopt_ifopt_plugin_factory.cpp) list(APPEND FACTORIES_SOURCE_LINK_LIBRARIES tesseract::tesseract_motion_planners_trajopt_ifopt) - list(APPEND LINUX_DEPENDS "${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-trajopt-ifopt") - list(APPEND WINDOWS_DEPENDS "${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-trajopt-ifopt") + list(APPEND LINUX_DEPENDS "${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-trajopt_ifopt") + list(APPEND WINDOWS_DEPENDS "${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-trajopt_ifopt") endif() if(tesseract_time_parameterization_isp_FOUND)