Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include task composer in .run-cpack, fix typos in CMakeLists #577

Merged
merged 2 commits into from
Jan 11, 2025
Merged

Include task composer in .run-cpack, fix typos in CMakeLists #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf3c245
Include task composer in .run-cpack, fix typos in CMakeLists
Jan 8, 2025
1d87163
Merge branch 'master' into fix/cpack-typos
Levi-Armstrong Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .run-cpack
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tesseract_motion_planners/descartes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Levi-Armstrong marked this conversation as resolved.
Show resolved Hide resolved
endif()
8 changes: 4 additions & 4 deletions tesseract_task_composer/planning/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,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"
Expand All @@ -77,7 +77,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)
Expand All @@ -103,8 +103,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")
Levi-Armstrong marked this conversation as resolved.
Show resolved Hide resolved
endif()

if(tesseract_time_parameterization_isp_FOUND)
Expand Down