Address packaging issues identified by buildserver

lantex · Mar 30, 2021 · 4cbd21f · 4cbd21f
1 parent a7fc7a5
commit 4cbd21f
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 57 deletions.
diff --git a/Schweizer-Messer/python_module/package.xml b/Schweizer-Messer/python_module/package.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0"?>
-<package>
+<package format="3">
   <name>python_module</name>
   <version>0.0.1</version>
   <description>python_module</description>
 
   <maintainer email="[email protected]">Paul Furgale</maintainer>
   <license>New BSD</license>
   <buildtool_depend>catkin</buildtool_depend>
+  <build_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</build_depend>
+  <build_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</build_depend>
 </package>
diff --git a/Schweizer-Messer/sm_boost/CMakeLists.txt b/Schweizer-Messer/sm_boost/CMakeLists.txt
@@ -37,17 +37,14 @@ install(TARGETS ${PROJECT_NAME}
 )
 
 ## Mark cpp header files for installation
-install(DIRECTORY include/${PROJECT_NAME}/
-  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-  FILES_MATCHING PATTERN "*.hpp"
-  PATTERN ".svn" EXCLUDE
+install(DIRECTORY include/
+  DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION} # Perhaps risky because of "boost"
 )
 
 #############
 ## Testing ##
 #############
 if(CATKIN_ENABLE_TESTING)
-
   # Avoid clash with tr1::tuple: https://code.google.com/p/googletest/source/browse/trunk/README?r=589#257
   add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0)
 
@@ -58,5 +55,4 @@ if(CATKIN_ENABLE_TESTING)
   if(TARGET ${PROJECT_NAME}-test)
     target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
   endif()
-
 endif()
diff --git a/Schweizer-Messer/sm_common/CMakeLists.txt b/Schweizer-Messer/sm_common/CMakeLists.txt
@@ -4,7 +4,6 @@ project(sm_common)
 set(CMAKE_CXX_STANDARD 14)
 
 find_package(catkin REQUIRED)
-include_directories(${catkin_INCLUDE_DIRS})
 find_package(Boost REQUIRED COMPONENTS system)
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -D__STRICT_ANSI__")
@@ -14,11 +13,15 @@ catkin_package(
   INCLUDE_DIRS include ${catkin_INCLUDE_DIRS}
   LIBRARIES ${PROJECT_NAME}
   CATKIN_DEPENDS 
-  DEPENDS
+  DEPENDS Boost
   CFG_EXTRAS export_flags.cmake
 )
 
-include_directories(include ${Boost_INCLUDE_DIRS})
+include_directories(
+  include
+  ${catkin_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
+)
 add_library(${PROJECT_NAME}
   src/progress_info.cpp
 )
@@ -36,18 +39,15 @@ install(TARGETS ${PROJECT_NAME}
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 
-
 ## Mark cpp header files for installation
-install(DIRECTORY include/${PROJECT_NAME}/
-  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-  FILES_MATCHING PATTERN "*.hpp"
+install(DIRECTORY include/
+  DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION} #${CATKIN_PACKAGE_INCLUDE_DESTINATION}
 )
 
 #############
 ## Testing ##
 #############
 if(CATKIN_ENABLE_TESTING)
-
   # Avoid clash with tr1::tuple: https://code.google.com/p/googletest/source/browse/trunk/README?r=589#257
   add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0)
 
@@ -59,5 +59,4 @@ if(CATKIN_ENABLE_TESTING)
     test/hash_id.cpp
     )
   target_link_libraries(${PROJECT_NAME}-test pthread)
-
 endif()
diff --git a/Schweizer-Messer/sm_common/package.xml b/Schweizer-Messer/sm_common/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package>
+<package format="3">
   <name>sm_common</name>
   <version>0.0.1</version>
   <description>sm_common</description>
@@ -8,5 +8,6 @@
   <license>New BSD</license>
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>boost</build_depend>
+  <build_export_depend>boost</build_export_depend>
   <test_depend>gtest</test_depend>
 </package>
diff --git a/Schweizer-Messer/sm_eigen/CMakeLists.txt b/Schweizer-Messer/sm_eigen/CMakeLists.txt
@@ -2,20 +2,16 @@ cmake_minimum_required(VERSION 3.0.2)
 project(sm_eigen)
 
 find_package(catkin REQUIRED COMPONENTS sm_common sm_random)
-include_directories(${catkin_INCLUDE_DIRS})
 find_package(Boost REQUIRED COMPONENTS system serialization)
 find_package(Eigen3 REQUIRED)
 
-include_directories(include ${EIGEN3_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
-
 catkin_package(
   INCLUDE_DIRS include ${EIGEN3_INCLUDE_DIRS}
   LIBRARIES ${PROJECT_NAME}
-  CATKIN_DEPENDS 
-  DEPENDS
+  CATKIN_DEPENDS sm_common sm_random
 )
 
-include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 
 ##############
 ## Building ##
@@ -39,17 +35,14 @@ install(TARGETS ${PROJECT_NAME}
 )
 
 ## Mark cpp header files for installation
-install(DIRECTORY include/${PROJECT_NAME}/
-  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-  FILES_MATCHING PATTERN "*.hpp"
-  PATTERN ".svn" EXCLUDE
+install(DIRECTORY include/
+  DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION} #${CATKIN_PACKAGE_INCLUDE_DESTINATION}
 )
 
 #############
 ## Testing ##
 #############
 if(CATKIN_ENABLE_TESTING)
-
   # Avoid clash with tr1::tuple: https://code.google.com/p/googletest/source/browse/trunk/README?r=589#257
   add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0)
 
@@ -62,5 +55,4 @@ if(CATKIN_ENABLE_TESTING)
   if(TARGET ${PROJECT_NAME}-test)
     target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
   endif()
-
 endif()
diff --git a/Schweizer-Messer/sm_kinematics/CMakeLists.txt b/Schweizer-Messer/sm_kinematics/CMakeLists.txt
@@ -4,10 +4,8 @@ project(sm_kinematics)
 set(CMAKE_CXX_STANDARD 14)
 
 find_package(catkin REQUIRED COMPONENTS sm_common sm_eigen sm_boost sm_random)
-include_directories(${catkin_INCLUDE_DIRS})
 find_package(Boost REQUIRED COMPONENTS system serialization filesystem)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
 find_package(Eigen3 REQUIRED)
 include_directories(${EIGEN3_INCLUDE_DIRS})
 add_definitions(${EIGEN_DEFINITIONS})
@@ -59,10 +57,8 @@ install(TARGETS ${PROJECT_NAME}
 )
 
 ## Mark cpp header files for installation
-install(DIRECTORY include/${PROJECT_NAME}/
-  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-  FILES_MATCHING PATTERN "*.hpp"
-  PATTERN ".svn" EXCLUDE
+install(DIRECTORY include/
+  DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
 )
 
 #############

diff --git a/Schweizer-Messer/sm_logging/CMakeLists.txt b/Schweizer-Messer/sm_logging/CMakeLists.txt
@@ -42,17 +42,14 @@ install(TARGETS ${PROJECT_NAME}
 )
 
 ## Mark cpp header files for installation
-install(DIRECTORY include/${PROJECT_NAME}/
-  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-  FILES_MATCHING PATTERN "*.hpp"
-  PATTERN ".svn" EXCLUDE
+install(DIRECTORY include/
+  DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
 )
 
 #############
 ## Testing ##
 #############
 if(CATKIN_ENABLE_TESTING)
-
   # Avoid clash with tr1::tuple: https://code.google.com/p/googletest/source/browse/trunk/README?r=589#257
   add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0)
 
@@ -62,5 +59,4 @@ if(CATKIN_ENABLE_TESTING)
   if(TARGET ${PROJECT_NAME}-test)
     target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
   endif()
-
 endif()
diff --git a/Schweizer-Messer/sm_matrix_archive/CMakeLists.txt b/Schweizer-Messer/sm_matrix_archive/CMakeLists.txt
@@ -4,21 +4,18 @@ project(sm_matrix_archive)
 set(CMAKE_CXX_STANDARD 14)
 
 find_package(catkin REQUIRED COMPONENTS sm_common)
-include_directories(${catkin_INCLUDE_DIRS})
 find_package(Boost REQUIRED COMPONENTS system filesystem)
 
 find_package(Eigen3 REQUIRED)
-include_directories(include ${EIGEN3_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
 
 catkin_package(
   INCLUDE_DIRS include  ${catkin_INCLUDE_DIRS}
   LIBRARIES ${PROJECT_NAME}
   CATKIN_DEPENDS sm_common
-  DEPENDS
 )
 add_definitions(-D__STRICT_ANSI__)
 
-include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+include_directories(include ${EIGEN3_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 
 ##############
 ## Building ##
@@ -35,7 +32,6 @@ target_link_libraries(${PROJECT_NAME}
 ## Testing ##
 #############
 if(CATKIN_ENABLE_TESTING)
-
   # Avoid clash with tr1::tuple: https://code.google.com/p/googletest/source/browse/trunk/README?r=589#257
   add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0)
 
@@ -47,5 +43,4 @@ if(CATKIN_ENABLE_TESTING)
   if(TARGET ${PROJECT_NAME}-test)
     target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
   endif()
-
 endif()
diff --git a/Schweizer-Messer/sm_property_tree/CMakeLists.txt b/Schweizer-Messer/sm_property_tree/CMakeLists.txt
@@ -32,11 +32,25 @@ add_library(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} 
                       ${catkin_LIBRARIES} ${Boost_LIBRARIES} pthread)
 
+##################
+## Installation ##
+##################
+
+install(TARGETS ${PROJECT_NAME}
+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
+## Mark cpp header files for installation
+install(DIRECTORY include/
+  DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
+)
+
 #############
 ## Testing ##
 #############
 if(CATKIN_ENABLE_TESTING)
-
   # Avoid clash with tr1::tuple: https://code.google.com/p/googletest/source/browse/trunk/README?r=589#257
   add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0)
 
@@ -48,5 +62,4 @@ if(CATKIN_ENABLE_TESTING)
   if(TARGET ${PROJECT_NAME}-test)
     target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
   endif()
-
 endif()
diff --git a/Schweizer-Messer/sm_random/CMakeLists.txt b/Schweizer-Messer/sm_random/CMakeLists.txt
@@ -32,8 +32,6 @@ install(TARGETS ${PROJECT_NAME}
 )
 
 ## Mark cpp header files for installation
-install(DIRECTORY include/${PROJECT_NAME}/
-  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-  FILES_MATCHING PATTERN "*.hpp"
-  PATTERN ".svn" EXCLUDE
-)
+install(DIRECTORY include/
+  DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
+)
diff --git a/Schweizer-Messer/sm_timing/CMakeLists.txt b/Schweizer-Messer/sm_timing/CMakeLists.txt
@@ -28,11 +28,25 @@ add_library(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} 
                       ${catkin_LIBRARIES} ${Boost_LIBRARIES})
 
+##################
+## Installation ##
+##################
+
+install(TARGETS ${PROJECT_NAME}
+ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
+## Mark cpp header files for installation
+install(DIRECTORY include/
+DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
+)
+
 #############
 ## Testing ##
 #############
 if(CATKIN_ENABLE_TESTING)
-
   # Avoid clash with tr1::tuple: https://code.google.com/p/googletest/source/browse/trunk/README?r=589#257
   add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0)
 
@@ -45,5 +59,4 @@ if(CATKIN_ENABLE_TESTING)
   if(TARGET ${PROJECT_NAME}-test)
     target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME} pthread)
   endif()
-
 endif()
diff --git a/aslam_optimizer/sparse_block_matrix/CMakeLists.txt b/aslam_optimizer/sparse_block_matrix/CMakeLists.txt
@@ -37,7 +37,7 @@ if(CATKIN_ENABLE_TESTING)
     test/solver_tests.cpp
     test/sparse_block_matrix_tests.cpp
   )
-  target_link_libraries(${PROJECT_NAME}_tests ${PROJECT_NAME} ${TBB_LIBRARIES})
+  target_link_libraries(${PROJECT_NAME}_tests ${PROJECT_NAME} ${TBB_LIBRARIES} ${SUITESPARSE_LIBRARIES})
 endif()
 
 # Install