Merge pull request #344 from ethz-asl/fix/noetic

Fix for noetic/focal
ethz-asl · Nov 16, 2021 · 483daf4 · 483daf4
2 parents 7c02a46 + 27e4d45
commit 483daf4
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 16 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -100,6 +100,6 @@
 [submodule "dependencies/3rdparty/pointmatcher-ros"]
 	path = dependencies/3rdparty/pointmatcher-ros
 	url = git@github.com:ANYbotics/pointmatcher-ros.git
-[submodule "dependencies/internal/libpointmatcher"]
-	path = dependencies/internal/libpointmatcher
-	url = git@github.com:ethz-asl/libpointmatcher.git
+[submodule "dependencies/3rdparty/libpointmatcher"]
+	path = dependencies/3rdparty/libpointmatcher
+	url = git@github.com:ANYbotics/libpointmatcher.git
diff --git a/aslam_cv2 b/aslam_cv2
diff --git a/common/maplab-common/src/python-interface.cc b/common/maplab-common/src/python-interface.cc
@@ -76,7 +76,7 @@ bool PythonInterface::loadModule(const std::string& python_script) {
   }
   CHECK(!module_name.empty());
 
-  PyObject* pyname = PyString_FromString(module_name.c_str());
+  PyObject* pyname = PyBytes_FromString(module_name.c_str());
   python_module_->obj = PyImport_Import(pyname);
   Py_DECREF(pyname);
   return *python_module_;

diff --git a/dependencies/3rdparty/libpointmatcher b/dependencies/3rdparty/libpointmatcher
diff --git a/dependencies/3rdparty/opencv3_catkin b/dependencies/3rdparty/opencv3_catkin
diff --git a/dependencies/3rdparty/pointmatcher-ros b/dependencies/3rdparty/pointmatcher-ros
diff --git a/dependencies/3rdparty/protobuf_catkin b/dependencies/3rdparty/protobuf_catkin
diff --git a/dependencies/3rdparty/vision_opencv b/dependencies/3rdparty/vision_opencv
diff --git a/dependencies/internal/ethzasl_brisk b/dependencies/internal/ethzasl_brisk
diff --git a/dependencies/internal/libpointmatcher b/dependencies/internal/libpointmatcher
diff --git a/dependencies/internal/maplab_msgs b/dependencies/internal/maplab_msgs
diff --git a/dependencies/internal/maplab_tools b/dependencies/internal/maplab_tools
diff --git a/dependencies/internal/minkindr b/dependencies/internal/minkindr
diff --git a/dependencies/internal/plotty b/dependencies/internal/plotty
diff --git a/dependencies/internal/voxblox b/dependencies/internal/voxblox