Skip to content

Commit

Permalink
code format
Browse files Browse the repository at this point in the history
  • Loading branch information
johnwason committed Jul 29, 2024
1 parent a725842 commit 7f20009
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/vcpkg_triplets/arm64-osx-dynamic-release.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
set(VCPKG_TARGET_ARCHITECTURE arm64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)

set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES arm64)

set(VCPKG_BUILD_TYPE release)
set(VCPKG_OSX_DEPLOYMENT_TARGET 14.0)
set(VCPKG_TARGET_ARCHITECTURE arm64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)

set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES arm64)

set(VCPKG_BUILD_TYPE release)
set(VCPKG_OSX_DEPLOYMENT_TARGET 14.0)
4 changes: 2 additions & 2 deletions tesseract_task_composer/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ install(
PATTERN "*.h"
PATTERN "*.hpp")

install(FILES ${PROJECT_BINARY_DIR}/core/tesseract_task_composer_nodes_export.h DESTINATION include/${PROJECT_NAME}/core/
COMPONENT core)
install(FILES ${PROJECT_BINARY_DIR}/core/tesseract_task_composer_nodes_export.h
DESTINATION include/${PROJECT_NAME}/core/ COMPONENT core)

# Plugin should not be export only installed
install(
Expand Down
7 changes: 3 additions & 4 deletions tesseract_task_composer/planning/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@ target_code_coverage(
ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
target_include_directories(
${PROJECT_NAME}_planning_nodes PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/../>"
"$<INSTALL_INTERFACE:include>")
"$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/../>" "$<INSTALL_INTERFACE:include>")

generate_export_header(${PROJECT_NAME}_planning_nodes)

Expand Down Expand Up @@ -177,8 +176,8 @@ install(
PATTERN "*.hpp"
PATTERN ".svn" EXCLUDE)

install(FILES ${PROJECT_BINARY_DIR}/planning/tesseract_task_composer_planning_nodes_export.h DESTINATION include/${PROJECT_NAME}/planning/
COMPONENT planning)
install(FILES ${PROJECT_BINARY_DIR}/planning/tesseract_task_composer_planning_nodes_export.h
DESTINATION include/${PROJECT_NAME}/planning/ COMPONENT planning)

# Plugin should not be export only installed
install(
Expand Down

0 comments on commit 7f20009

Please sign in to comment.