Merge pull request #19 from uos/humble-dev

Fixes for better ROS integration

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.4)
-project(LAS_VEGAS VERSION 2)
+project(lvr2 VERSION 2)
 
 # OPTIONS
 option(BUILD_EXAMPLES "Build the examples" OFF)
@@ -16,8 +16,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 include(GNUInstallDirs)
 
-
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -36,9 +34,10 @@ if(embree_FOUND)
   list(APPEND LVR2_DEFINITIONS -DLVR2_USE_EMBREE)
 endif(embree_FOUND)
 
+
 set(CMAKE_MODULE_PATH
-  ${LAS_VEGAS_SOURCE_DIR}/CMakeModules
-  ${LAS_VEGAS_SOURCE_DIR}/ext/kintinuous/cmake/Modules
+  ${PROJECT_SOURCE_DIR}/CMakeModules
+  ${PROJECT_SOURCE_DIR}/ext/kintinuous/cmake/Modules
   ${CMAKE_MODULE_PATH}
 )
 
@@ -460,7 +459,7 @@ endif()
 if(CUDA_FOUND AND "${OpenCV_VERSION_PATCH}" VERSION_GREATER "8" AND WITH_KINFU)
     message(STATUS "Building LVR KinFu.")
     add_subdirectory(ext/kintinuous)
-    include_directories(${LAS_VEGAS_SOURCE_DIR}/ext/kintinuous/kfusion/include)
+    include_directories(${PROJECT_SOURCE_DIR}/ext/kintinuous/kfusion/include)
 endif()
 
 
@@ -716,6 +715,4 @@ if( DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND )
       ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       COMMENT "Generating API documentation with Doxygen" VERBATIM )
-endif( DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND )
-
-
+endif( DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND )

package.xml

@@ -8,10 +8,10 @@ The Las Vegas Surface Reconstruction Toolkit is an Open Source toolkit to recons
 
   <maintainer email="[email protected]">Sebastian Pütz</maintainer>
   <maintainer email="[email protected]">Thomas Wiemann</maintainer>
+  <maintainer email="[email protected]">Alexander Mock</maintainer>
 
   <license>BSD-3-Clause</license>
 
-
   <url type="website">https://www.las-vegas.uni-osnabrueck.de/</url>
 
 
@@ -25,6 +25,7 @@ The Las Vegas Surface Reconstruction Toolkit is an Open Source toolkit to recons
   <author email="[email protected]">Dominik Feldschnieders</author>
   <author email="[email protected]">Alexander Löhr</author>
 
+  <buildtool_depend>cmake</buildtool_depend>
 
   <depend>libflann-dev</depend>
   <depend>libgsl</depend>
@@ -41,6 +42,6 @@ The Las Vegas Surface Reconstruction Toolkit is an Open Source toolkit to recons
   <depend>yaml-cpp</depend>
 
   <export>
-    <build_type>ament_cmake</build_type>
+    <build_type>cmake</build_type>
   </export>
 </package>