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

Fix cpack typo to use trajopt_common over trajopt_utils #436

Merged
merged 2 commits into from
Jan 4, 2025
Merged

Fix cpack typo to use trajopt_common over trajopt_utils #436

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
c6019e6
Fix cpack typo to use trajopt_common over trajopt_utils
Jan 3, 2025
8bc39dd
Merge branch 'master' into fix/cpack-utils-common-typo
Levi-Armstrong Jan 4, 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
4 changes: 2 additions & 2 deletions trajopt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ if(TRAJOPT_PACKAGE)
"libconsole-bridge-dev"
"libjsoncpp-dev"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-sco"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-utils"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-common"
"${TESSERACT_PACKAGE_PREFIX}tesseract-environment"
"${TESSERACT_PACKAGE_PREFIX}tesseract-visualization"
WINDOWS_DEPENDS
Expand All @@ -123,7 +123,7 @@ if(TRAJOPT_PACKAGE)
"console-bridge"
"jsoncpp"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-sco"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-utils"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-common"
"${TESSERACT_PACKAGE_PREFIX}tesseract-environment"
"${TESSERACT_PACKAGE_PREFIX}tesseract-visualization")
endif()
4 changes: 2 additions & 2 deletions trajopt_ifopt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ if(TRAJOPT_PACKAGE)
"libboost-dev"
"libconsole-bridge-dev"
"ifopt"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-utils"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-common"
"${TESSERACT_PACKAGE_PREFIX}tesseract-environment"
WINDOWS_DEPENDS
"Eigen3"
"boost"
"console-bridge"
"ifopt"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-utils"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-common"
"${TESSERACT_PACKAGE_PREFIX}tesseract-environment")
endif()
4 changes: 2 additions & 2 deletions trajopt_optimizers/trajopt_sqp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ if(TRAJOPT_PACKAGE)
"ifopt"
"${TRAJOPT_PACKAGE_PREFIX}osqpeigen"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-ifopt"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-utils"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-common"
"${TESSERACT_PACKAGE_PREFIX}tesseract-common"
"${TESSERACT_PACKAGE_PREFIX}tesseract-visualization"
WINDOWS_DEPENDS
Expand All @@ -141,7 +141,7 @@ if(TRAJOPT_PACKAGE)
"ifopt"
"${TRAJOPT_PACKAGE_PREFIX}osqpeigen"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-ifopt"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-utils"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-common"
"${TESSERACT_PACKAGE_PREFIX}tesseract-common"
"${TESSERACT_PACKAGE_PREFIX}tesseract-visualization")
endif()
4 changes: 2 additions & 2 deletions trajopt_sco/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,12 @@ if(TRAJOPT_PACKAGE)
"libeigen3-dev"
"libboost-dev"
"libjsoncpp-dev"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-utils")
"${TRAJOPT_PACKAGE_PREFIX}trajopt-common")
set(WINDOWS_DEPENDS
"Eigen3"
"boost"
"jsoncpp"
"${TRAJOPT_PACKAGE_PREFIX}trajopt-utils")
"${TRAJOPT_PACKAGE_PREFIX}trajopt-common")

if(GUROBI_FOUND)
# TODO
Expand Down
Loading