Add ARCHIVE_DESTINATION for static builds

AVP-UMN · Dec 23, 2014 · a974522 · a974522
1 parent 08172c2
commit a974522
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 1 deletion.
diff --git a/base_local_planner/CMakeLists.txt b/base_local_planner/CMakeLists.txt
@@ -114,6 +114,7 @@ target_link_libraries(point_grid ${catkin_LIBRARIES})
 install(TARGETS
             base_local_planner
             trajectory_planner_ros
+       ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        )
 

diff --git a/carrot_planner/CMakeLists.txt b/carrot_planner/CMakeLists.txt
@@ -34,6 +34,7 @@ target_link_libraries(carrot_planner
     )
 
 install(TARGETS carrot_planner
+       ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        )
 

diff --git a/clear_costmap_recovery/CMakeLists.txt b/clear_costmap_recovery/CMakeLists.txt
@@ -55,6 +55,7 @@ endif()
 
 
 install(TARGETS clear_costmap_recovery
+       ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        )
 

diff --git a/costmap_2d/CMakeLists.txt b/costmap_2d/CMakeLists.txt
@@ -197,6 +197,7 @@ install( TARGETS
 install(TARGETS
     costmap_2d
     layers
+    ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
     LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 )
 

diff --git a/dwa_local_planner/CMakeLists.txt b/dwa_local_planner/CMakeLists.txt
@@ -47,6 +47,7 @@ add_dependencies(dwa_local_planner dwa_local_planner_gencfg)
 add_dependencies(dwa_local_planner nav_msgs_gencpp)
 
 install(TARGETS dwa_local_planner
+       ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        )
 

diff --git a/move_slow_and_clear/CMakeLists.txt b/move_slow_and_clear/CMakeLists.txt
@@ -48,6 +48,7 @@ install(DIRECTORY include/${PROJECT_NAME}/
     PATTERN ".svn" EXCLUDE)
 
 install(TARGETS move_slow_and_clear
+       ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        )
 

diff --git a/navfn/CMakeLists.txt b/navfn/CMakeLists.txt
@@ -66,6 +66,7 @@ target_link_libraries(navfn_node
     )
 
 install(TARGETS navfn navfn_node
+       ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
        )

diff --git a/rotate_recovery/CMakeLists.txt b/rotate_recovery/CMakeLists.txt
@@ -32,6 +32,7 @@ add_library(rotate_recovery src/rotate_recovery.cpp)
 target_link_libraries(rotate_recovery ${catkin_LIBRARIES})
 
 install(TARGETS rotate_recovery
+       ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
        )
 

diff --git a/voxel_grid/CMakeLists.txt b/voxel_grid/CMakeLists.txt
@@ -21,6 +21,7 @@ add_library(voxel_grid src/voxel_grid.cpp)
 target_link_libraries(voxel_grid ${catkin_LIBRARIES})
 
 install(TARGETS voxel_grid
+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 )
 
@@ -34,4 +35,4 @@ if(CATKIN_ENABLE_TESTING)
     voxel_grid
     ${catkin_LIBRARIES}
   )
-endif()
+endif()
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ target_link_libraries(carrot_planner @@
         )
     install(TARGETS carrot_planner
+           ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
            LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
            )
@@ Expand Down @@