apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup dependencies and CMakeLists.txt

Browse Source 
I added a versioned dependency on pcl, fixes #1,
and I added a dependency on pcl_msgs, fixes #2,
and I wrapped the test target in a
CATKIN_ENABLE_TESTING check.
This commit is contained in:
William Woodall 2013-07-13 13:19:08 -07:00
parent cb88b4f66e
commit b4071f4aa6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 2.8.3)
project(pcl_conversions) project(pcl_conversions)
find_package(catkin REQUIRED COMPONENTS roscpp sensor_msgs std_msgs) find_package(catkin REQUIRED COMPONENTS pcl_msgs roscpp sensor_msgs std_msgs)
find_package(PCL REQUIRED QUIET COMPONENTS common) find_package(PCL REQUIRED QUIET COMPONENTS common)
@ -9,7 +9,7 @@ include_directories(include ${catkin_INCLUDE_DIRS} ${PCL_COMMON_INCLUDE_DIRS})
catkin_package( catkin_package(
INCLUDE_DIRS include ${PCL_COMMON_INCLUDE_DIRS} INCLUDE_DIRS include ${PCL_COMMON_INCLUDE_DIRS}
CATKIN_DEPENDS sensor_msgs std_msgs CATKIN_DEPENDS pcl_msgs roscpp sensor_msgs std_msgs
) )
# Mark cpp header files for installation # Mark cpp header files for installation
@ -20,5 +20,7 @@ install(DIRECTORY include/${PROJECT_NAME}/
) )
# Add gtest based cpp test target # Add gtest based cpp test target
if(CATKIN_ENABLE_TESTING)
catkin_add_gtest(${PROJECT_NAME}-test test/test_pcl_conversions.cpp) catkin_add_gtest(${PROJECT_NAME}-test test/test_pcl_conversions.cpp)
target_link_libraries(${PROJECT_NAME}-test ${catkin_LIBRARIES}) target_link_libraries(${PROJECT_NAME}-test ${catkin_LIBRARIES})
endif()

6
package.xml
View File

@ -14,12 +14,14 @@
<buildtool_depend>catkin</buildtool_depend> <buildtool_depend>catkin</buildtool_depend>
<build_depend>pcl</build_depend> <build_depend version_gte="1.7.0">pcl</build_depend>
<build_depend>pcl_msgs</build_depend>
<build_depend>roscpp</build_depend> <build_depend>roscpp</build_depend>
<build_depend>sensor_msgs</build_depend> <build_depend>sensor_msgs</build_depend>
<build_depend>std_msgs</build_depend> <build_depend>std_msgs</build_depend>
<run_depend>pcl</run_depend> <run_depend version_gte="1.7.0">pcl</run_depend>
<run_depend>pcl_msgs</run_depend>
<run_depend>roscpp</run_depend> <run_depend>roscpp</run_depend>
<run_depend>sensor_msgs</run_depend> <run_depend>sensor_msgs</run_depend>
<run_depend>std_msgs</run_depend> <run_depend>std_msgs</run_depend>