Full local linux-64 rebuild

patch/ros-noetic-jsk-recognition-utils.patch

@@ -1,3 +1,65 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 55c405fd0..a53d0f349 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,7 +39,8 @@ configure_file(
+ # ------------------------------------------------------------------------------------
+
+ # download and install font data
+-add_custom_target(${PROJECT_NAME}_install_font_data ALL COMMAND python$ENV{ROS_PYTHON_VERSION} ${PROJECT_SOURCE_DIR}/scripts/install_font_data.py)
++find_package (Python COMPONENTS Interpreter Development NumPy)
++add_custom_target(${PROJECT_NAME}_install_font_data ALL COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/install_font_data.py)
+
+ catkin_python_setup()
+
+@@ -62,6 +63,7 @@ add_subdirectory(python/${PROJECT_NAME})
+
+ find_package(OpenCV REQUIRED core imgproc)
+ find_package(PCL REQUIRED)
++find_package(GLEW REQUIRED)
+ find_package(PkgConfig)
+ pkg_check_modules(yaml_cpp yaml-cpp REQUIRED)
+ IF(${yaml_cpp_VERSION} VERSION_LESS "0.5.0")
+@@ -72,11 +74,10 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z defs")
+ endif()
+ include_directories(
+-  include ${catkin_INCLUDE_DIRS}
++  include ${catkin_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS}
+ )
+-link_libraries(${catkin_LIBRARIES} ${OpenCV_LIBRARIES} ${PCL_LIBRARIES} yaml-cpp)
+
+-add_library(jsk_recognition_utils SHARED
++add_library(jsk_recognition_utils
+   src/grid_index.cpp
+   src/grid_map.cpp
+   src/grid_line.cpp
+@@ -102,6 +103,8 @@ add_library(jsk_recognition_utils SHARED
+   src/time_util.cpp
+   )
+
++target_link_libraries(jsk_recognition_utils ${catkin_LIBRARIES} ${OpenCV_LIBRARIES} ${PCL_LIBRARIES} ${yaml_cpp_LIBRARIES} ${GLEW_LIBRARIES})
++
+ if (CATKIN_ENABLE_TESTING)
+   find_package(rostest REQUIRED)
+   if("$ENV{ROS_DISTRO}" STRGREATER "indigo") # kinetic and later uses qt5
+diff --git a/cmake/FindCython.cmake b/cmake/FindCython.cmake
+index f44f1f707..d7fb4205f 100644
+--- a/cmake/FindCython.cmake
++++ b/cmake/FindCython.cmake
+@@ -24,9 +24,9 @@
+
+ # Use the Cython executable that lives next to the Python executable
+ # if it is a local installation.
+-find_package( PythonInterp )
+-if( PYTHONINTERP_FOUND )
+-  get_filename_component( _python_path ${PYTHON_EXECUTABLE} PATH )
++find_package (Python COMPONENTS Interpreter Development NumPy)
++if( Python_Interpreter_FOUND )
++  get_filename_component( _python_path ${Python_EXECUTABLE} PATH )
+   find_program( CYTHON_EXECUTABLE
+     NAMES cython cython.bat cython3
+     HINTS ${_python_path}
 diff --git a/cmake/UseCython.cmake b/cmake/UseCython.cmake
 index f432c890c..0a11631e5 100644
 --- a/cmake/UseCython.cmake
@@ -614,58 +676,6 @@ index f432c890c..0a11631e5 100644
 +  set(pxd_location "" CACHE INTERNAL "")
 +endfunction()
 \ No newline at end of file
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 55c405fd0..06a4adbbc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,6 +62,7 @@ add_subdirectory(python/${PROJECT_NAME})
-
- find_package(OpenCV REQUIRED core imgproc)
- find_package(PCL REQUIRED)
-+find_package(GLEW REQUIRED)
- find_package(PkgConfig)
- pkg_check_modules(yaml_cpp yaml-cpp REQUIRED)
- IF(${yaml_cpp_VERSION} VERSION_LESS "0.5.0")
-@@ -72,11 +73,10 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z defs")
- endif()
- include_directories(
--  include ${catkin_INCLUDE_DIRS}
-+  include ${catkin_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS}
- )
--link_libraries(${catkin_LIBRARIES} ${OpenCV_LIBRARIES} ${PCL_LIBRARIES} yaml-cpp)
-
--add_library(jsk_recognition_utils SHARED
-+add_library(jsk_recognition_utils
-   src/grid_index.cpp
-   src/grid_map.cpp
-   src/grid_line.cpp
-@@ -102,6 +102,8 @@ add_library(jsk_recognition_utils SHARED
-   src/time_util.cpp
-   )
-
-+target_link_libraries(jsk_recognition_utils ${catkin_LIBRARIES} ${OpenCV_LIBRARIES} ${PCL_LIBRARIES} ${yaml_cpp_LIBRARIES} ${GLEW_LIBRARIES})
-+
- if (CATKIN_ENABLE_TESTING)
-   find_package(rostest REQUIRED)
-   if("$ENV{ROS_DISTRO}" STRGREATER "indigo") # kinetic and later uses qt5
-diff --git a/cmake/FindCython.cmake b/cmake/FindCython.cmake
-index f44f1f707..d7fb4205f 100644
---- a/cmake/FindCython.cmake
-+++ b/cmake/FindCython.cmake
-@@ -24,9 +24,9 @@
-
- # Use the Cython executable that lives next to the Python executable
- # if it is a local installation.
--find_package( PythonInterp )
--if( PYTHONINTERP_FOUND )
--  get_filename_component( _python_path ${PYTHON_EXECUTABLE} PATH )
-+find_package (Python COMPONENTS Interpreter Development NumPy)
-+if( Python_Interpreter_FOUND )
-+  get_filename_component( _python_path ${Python_EXECUTABLE} PATH )
-   find_program( CYTHON_EXECUTABLE
-     NAMES cython cython.bat cython3
-     HINTS ${_python_path}
 diff --git a/python/jsk_recognition_utils/CMakeLists.txt b/python/jsk_recognition_utils/CMakeLists.txt
 index d3feba4f5..496ca09dc 100644
 --- a/python/jsk_recognition_utils/CMakeLists.txt