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 build #1104

Merged
merged 2 commits into from
Jan 14, 2025
+18 −2
Merged

Fix cpack build #1104

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
2a7e02c
Fix cpack build
Levi-Armstrong Jan 14, 2025
e269c79
Enable cpack in ubuntu CI pipeline
Levi-Armstrong Jan 14, 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 .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ jobs:
vcs-file: dependencies.repos
upstream-args: --cmake-args -DCMAKE_BUILD_TYPE=Release
target-path: target_ws/src
target-args: --cmake-args -DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON
target-args: --cmake-args -DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON -DTESSERACT_PACKAGE=ON
2 changes: 2 additions & 0 deletions tesseract_collision/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ endif()

# Examples
if((TESSERACT_ENABLE_EXAMPLES OR TESSERACT_COLLISION_ENABLE_EXAMPLES) AND TESSERACT_BUILD_FCL)
message("Building examples components")
list(APPEND SUPPORTED_COMPONENTS examples)
add_subdirectory(examples)
endif()

Expand Down
14 changes: 13 additions & 1 deletion tesseract_collision/examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,16 @@ target_cxx_version(${PROJECT_NAME}_box_box_example PRIVATE VERSION ${TESSERACT_C
target_clang_tidy(${PROJECT_NAME}_box_box_example ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
target_compile_definitions(${PROJECT_NAME}_box_box_example PRIVATE DATA_DIR="${CMAKE_SOURCE_DIR}/test")

install(TARGETS ${PROJECT_NAME}_box_box_example DESTINATION bin)
configure_component(
COMPONENT examples
NAMESPACE tesseract
TARGETS ${PROJECT_NAME}_box_box_example
DEPENDENCIES "tesseract_collision COMPONENTS core bullet fcl")

if(TESSERACT_PACKAGE)
cpack_component(
COMPONENT examples
VERSION ${pkg_extracted_version}
DESCRIPTION "Tesseract Collision Examples components"
COMPONENT_DEPENDS core bullet fcl)
endif()
1 change: 1 addition & 0 deletions tesseract_collision/test_suite/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ target_include_directories(
install(
DIRECTORY include/${PROJECT_NAME}
DESTINATION include
COMPONENT test_suite
FILES_MATCHING
PATTERN "*.h"
PATTERN "*.hpp"
Expand Down
1 change: 1 addition & 0 deletions tesseract_collision/vhacd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ endif()
install(
DIRECTORY include/${PROJECT_NAME}
DESTINATION include
COMPONENT vhacd
FILES_MATCHING
PATTERN "*.h"
PATTERN "*.hpp"
Expand Down
Loading