moved some stuff

dimatura · Apr 17, 2018 · 2d0ffe6 · 2d0ffe6
1 parent 03e81fb
commit 2d0ffe6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,7 @@ find_package(catkin REQUIRED COMPONENTS
   geometry_msgs
   nav_msgs
   pybind11_catkin
+  pybind11
   roscpp
   rospy
   sensor_msgs
@@ -16,7 +17,7 @@ find_package(catkin REQUIRED COMPONENTS
 )
 
 find_package(NUMPY REQUIRED)
-find_package(pybind11 REQUIRED)
+#find_package(pybind11 REQUIRED)
 
 catkin_python_setup()
 
@@ -42,7 +43,7 @@ include_directories(
     #${PYBIND11_INCLUDE_DIRS}
 )
 
-message("pybind11_include_dir " ${PYBIND11_INCLUDE_DIRS})
+#message("pybind11_include_dir " ${PYBIND11_INCLUDE_DIRS})
 pybind_add_module(libpyrosmsg
     src_wrap/module.cpp
 )
diff --git a/python/pyrosmsg/__init__.py → pyrosmsg/__init__.py b/python/pyrosmsg/__init__.py → pyrosmsg/__init__.py
diff --git a/setup.py b/setup.py
@@ -6,6 +6,6 @@
 # fetch values from package.xml
 setup_args = generate_distutils_setup(
     packages=['pyrosmsg'],
-    package_dir={'':'python'})
+    package_dir={'':''})
 
 setup(**setup_args)