Skip to content

Commit

Permalink
Fix export msg including error in humble.
Browse files Browse the repository at this point in the history
  • Loading branch information
ZhenshengLee committed Dec 8, 2022
1 parent fd8043a commit 42fde5f
Showing 1 changed file with 27 additions and 65 deletions.
92 changes: 27 additions & 65 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,57 +32,6 @@ find_package(Open3D)
find_package(Boost QUIET)
find_package(PCL REQUIRED QUIET COMPONENTS common io)
find_package(pcl_msgs REQUIRED)
# pcl vtk conflict
list(REMOVE_ITEM PCL_LIBRARIES
vtkChartsCore
vtkCommonColor
vtkCommonCore
vtksys
vtkCommonDataModel
vtkCommonMath
vtkCommonMisc
vtkCommonSystem
vtkCommonTransforms
vtkCommonExecutionModel
vtkFiltersGeneral
vtkCommonComputationalGeometry
vtkFiltersCore
vtkInfovisCore
vtkFiltersExtraction
vtkFiltersStatistics
vtkImagingFourier
vtkImagingCore
vtkalglib
vtkRenderingContext2D
vtkRenderingCore
vtkFiltersGeometry
vtkFiltersSources
vtkRenderingFreeType
vtkFiltersModeling
vtkImagingSources
vtkInteractionStyle
vtkInteractionWidgets
vtkFiltersHybrid
vtkImagingColor
vtkImagingGeneral
vtkImagingHybrid
vtkIOImage
vtkDICOMParser
vtkmetaio
vtkRenderingAnnotation
vtkRenderingVolume
vtkIOXML
vtkIOCore
vtkIOXMLParser
vtkIOGeometry
vtkIOLegacy
vtkIOPLY
vtkRenderingLOD
vtkViewsContext2D
vtkViewsCore
vtkRenderingContextOpenGL2
vtkRenderingOpenGL2
)

find_package(OpenCV 4 QUIET)
if(NOT OpenCV_FOUND)
Expand Down Expand Up @@ -124,25 +73,27 @@ rosidl_generate_interfaces(${PROJECT_NAME}
ADD_LINTER_TESTS
)

rosidl_get_typesupport_target(cpp_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_cpp")

if(cpp_typesupport_target)
add_library(${PROJECT_NAME}_library INTERFACE)
target_include_directories(${PROJECT_NAME}_library INTERFACE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
target_link_libraries(${PROJECT_NAME}_library INTERFACE
"${cpp_typesupport_target}")

install(
TARGETS ${PROJECT_NAME}_library EXPORT export_${PROJECT_NAME}
)
endif()

include_directories(
include
${EIGEN3_INCLUDE_DIR}
${PCL_COMMON_INCLUDE_DIRS}
)

install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION include/${PROJECT_NAME}/
)

install(DIRECTORY res
DESTINATION lib/${PROJECT_NAME}/
)

install(DIRECTORY
launch
DESTINATION share/${PROJECT_NAME}
)

add_subdirectory(lib)

add_subdirectory(src)
Expand All @@ -157,9 +108,20 @@ endif()

add_subdirectory(tool)

ament_export_targets(export_${PROJECT_NAME})
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION include/${PROJECT_NAME}/
)

install(DIRECTORY res
DESTINATION lib/${PROJECT_NAME}/
)

install(DIRECTORY launch
DESTINATION share/${PROJECT_NAME}
)

ament_export_dependencies(${dependencies})
ament_export_include_directories(include)
ament_export_targets(export_${PROJECT_NAME})

ament_package()

0 comments on commit 42fde5f

Please sign in to comment.