Merge pull request #76 from youliangtan/dev/noetic

Compile cython code during catkin build stretch_funmap

stretch_funmap/CMakeLists.txt

@@ -11,6 +11,14 @@ find_package(catkin REQUIRED COMPONENTS
   rospy
 )
 
+set(cython_code_dir ${CMAKE_CURRENT_SOURCE_DIR}/src/stretch_funmap)
+
+message("Compile cython code within cmake build")
+execute_process(
+  WORKING_DIRECTORY ${cython_code_dir}
+  COMMAND bash ${cython_code_dir}/compile_cython_code.sh
+)
+
 ## System dependencies are found with CMake's conventions
 # find_package(Boost REQUIRED COMPONENTS system)
 

stretch_funmap/package.xml

@@ -49,6 +49,7 @@
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>rospy</build_depend>
   <build_export_depend>rospy</build_export_depend>
+  <build_depend>cython3</build_depend>
   <exec_depend>rospy</exec_depend>
   <exec_depend>ros_numpy</exec_depend>
 

stretch_funmap/src/stretch_funmap/compile_cython_code.sh

@@ -1,8 +1,11 @@
 #!/bin/bash
 
 echo "Building cython_min_cost_path.pyx..."
-cython3 ./cython_min_cost_path.pyx 
-gcc -shared -pthread -fPIC -fwrapv -ffast-math -O3 -Wall -fno-strict-aliasing -I/usr/include/python3.8 -o cython_min_cost_path.so cython_min_cost_path.c
+cython3 ./cython_min_cost_path.pyx
+
+PY_INCLUDE_PATH=$(python3 -c 'from sysconfig import get_paths as gp; print(gp()["include"])')
+echo "Using python lib: $PY_INCLUDE_PATH"
+gcc -shared -pthread -fPIC -fwrapv -ffast-math -O3 -Wall -fno-strict-aliasing -I$PY_INCLUDE_PATH -o cython_min_cost_path.so cython_min_cost_path.c
 echo "Done."
 echo ""