Merge pull request #7 from piyushk/master

cleaned up most catkin_lint warnings. closes #6
utexas-bwi · Apr 28, 2014 · 58fe283 · 58fe283
2 parents 88717e6 + ed9c80e
commit 58fe283
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 56 deletions.
diff --git a/bwi_gazebo_entities/CMakeLists.txt b/bwi_gazebo_entities/CMakeLists.txt
@@ -8,10 +8,10 @@ catkin_package()
 foreach(dir entities gazebo launch persons urdf)
   install(DIRECTORY ${dir}/
     DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
-endforeach(dir)
+endforeach()
 
 # unit tests are enabled selectively
-if (CATKIN_ENABLE_TESTING)
+if(CATKIN_ENABLE_TESTING)
   find_package(roslaunch REQUIRED)
   roslaunch_add_file_check(launch)
-endif (CATKIN_ENABLE_TESTING)
+endif()
diff --git a/bwi_mapper/CMakeLists.txt b/bwi_mapper/CMakeLists.txt
@@ -14,7 +14,7 @@ pkg_check_modules(YAML_CPP REQUIRED yaml-cpp)
 
 if(NOT ${YAML_CPP_VERSION} VERSION_LESS "0.5")
 add_definitions(-DHAVE_NEW_YAMLCPP)
-endif(NOT ${YAML_CPP_VERSION} VERSION_LESS "0.5")
+endif()
 
 ###################################
 ## catkin specific configuration ##
@@ -68,30 +68,21 @@ target_link_libraries(bwi_mapper
 )
 
 #binaries
-add_executable(generate_graph src/nodes/generate_graph.cpp)
-target_link_libraries(generate_graph bwi_mapper)
-
-add_executable(view_graph src/nodes/view_graph.cpp)
-target_link_libraries(view_graph bwi_mapper)
-
-add_executable(prepare_graph src/nodes/prepare_graph.cpp)
-target_link_libraries(prepare_graph bwi_mapper)
+set(node_targets)
+foreach(node generate_graph view_graph prepare_graph) 
+  add_executable(${PROJECT_NAME}/${node} src/nodes/${node}.cpp)
+  set_target_properties(${PROJECT_NAME}/${node} PROPERTIES OUTPUT_NAME "${node}")
+  target_link_libraries(${PROJECT_NAME}/${node} bwi_mapper)
+  list(APPEND node_targets ${PROJECT_NAME}/${node})
+endforeach()
 
 #test binaries
-add_executable(test_circle test/test_circle.cpp)
-target_link_libraries(test_circle bwi_mapper)
-
-add_executable(test_map_loader test/test_map_loader.cpp)
-target_link_libraries(test_map_loader bwi_mapper)
-
-add_executable(test_voronoi test/test_voronoi.cpp)
-target_link_libraries(test_voronoi bwi_mapper)
-
-add_executable(test_dfs test/test_dfs.cpp)
-target_link_libraries(test_dfs bwi_mapper)
-
-add_executable(test_graph test/test_graph.cpp)
-target_link_libraries(test_graph bwi_mapper)
+foreach(node test_circle test_map_loader test_voronoi test_dfs test_graph)
+  add_executable(${PROJECT_NAME}/${node} test/${node}.cpp)
+  set_target_properties(${PROJECT_NAME}/${node} PROPERTIES OUTPUT_NAME "${node}")
+  target_link_libraries(${PROJECT_NAME}/${node} bwi_mapper)
+  list(APPEND node_targets ${PROJECT_NAME}/${node})
+endforeach()
 
 #############
 ## Install ##
@@ -106,16 +97,10 @@ install(DIRECTORY maps/
 )
 
 install(TARGETS
-  bwi_mapper
-  generate_graph
-  view_graph
-  prepare_graph
-  test_circle
-  test_map_loader
-  test_voronoi
-  test_dfs
-  test_graph
-  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+  ${PROJECT_NAME}
+  ${node_targets}
+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 
diff --git a/bwi_planning_common/CMakeLists.txt b/bwi_planning_common/CMakeLists.txt
@@ -9,7 +9,7 @@ pkg_check_modules(YAML_CPP REQUIRED yaml-cpp)
 
 if(NOT ${YAML_CPP_VERSION} VERSION_LESS "0.5")
 add_definitions(-DHAVE_NEW_YAMLCPP)
-endif(NOT ${YAML_CPP_VERSION} VERSION_LESS "0.5")
+endif()
 
 add_message_files(
   FILES
@@ -58,21 +58,18 @@ target_link_libraries(${PROJECT_NAME}
   ${YAML_CPP_LIBRARIES}
 )
 
-add_executable(mark_locations
-  src/mark_locations.cpp
-)
-target_link_libraries(mark_locations
-  ${PROJECT_NAME}
-)
+add_executable(${PROJECT_NAME}/mark_locations src/mark_locations.cpp)
+set_target_properties(${PROJECT_NAME}/mark_locations PROPERTIES OUTPUT_NAME "mark_locations")
+target_link_libraries(${PROJECT_NAME}/mark_locations ${PROJECT_NAME})
 
-add_executable(mark_doors
-  src/mark_doors.cpp
-)
-target_link_libraries(mark_doors
-  ${PROJECT_NAME}
-)
+add_executable(${PROJECT_NAME}/mark_doors src/mark_doors.cpp)
+set_target_properties(${PROJECT_NAME}/mark_doors PROPERTIES OUTPUT_NAME "mark_doors")
+target_link_libraries(${PROJECT_NAME}/mark_doors ${PROJECT_NAME})
 
-install(TARGETS ${PROJECT_NAME} mark_doors mark_locations
+install(TARGETS 
+  ${PROJECT_NAME} 
+  ${PROJECT_NAME}/mark_doors 
+  ${PROJECT_NAME}/mark_locations
   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
@@ -87,7 +84,7 @@ install(DIRECTORY launch/
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch)
 
 # unit tests are enabled selectively
-if (CATKIN_ENABLE_TESTING)
+if(CATKIN_ENABLE_TESTING)
   find_package(roslaunch REQUIRED)
   roslaunch_add_file_check(launch)
-endif (CATKIN_ENABLE_TESTING)
+endif()
diff --git a/bwi_web/CMakeLists.txt b/bwi_web/CMakeLists.txt
@@ -9,7 +9,7 @@ install(DIRECTORY launch/
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch)
 
 # unit tests are enabled selectively
-if (CATKIN_ENABLE_TESTING)
+if(CATKIN_ENABLE_TESTING)
   find_package(roslaunch REQUIRED)
   roslaunch_add_file_check(launch)
-endif (CATKIN_ENABLE_TESTING)
+endif()
diff --git a/utexas_gdc/CMakeLists.txt b/utexas_gdc/CMakeLists.txt
@@ -7,10 +7,10 @@ catkin_package()
 foreach(dir launch maps Media worlds)
   install(DIRECTORY ${dir}/
     DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
-endforeach(dir)
+endforeach()
 
 # unit tests are enabled selectively
 if (CATKIN_ENABLE_TESTING)
   find_package(roslaunch REQUIRED)
   roslaunch_add_file_check(launch)
-endif (CATKIN_ENABLE_TESTING)
+endif ()