diff --git a/.github/workflows/humble-ros.yml b/.github/workflows/humble-ros.yml
new file mode 100644
index 000000000..a3e78f979
--- /dev/null
+++ b/.github/workflows/humble-ros.yml
@@ -0,0 +1,25 @@
+name: CI-humble
+on:
+ push:
+ branches:
+ - 'humble'
+ pull_request:
+ branches:
+ - 'humble'
+ workflow_dispatch:
+ branches:
+ - '*'
+jobs:
+ industrial_ci:
+ strategy:
+ matrix:
+ env:
+ - {ROS_DISTRO: humble, ROS_REPO: testing}
+ - {ROS_DISTRO: humble, ROS_REPO: main}
+ runs-on: ubuntu-22.04
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ submodules: recursive
+ - uses: 'ros-industrial/industrial_ci@master'
+ env: ${{matrix.env}}
diff --git a/.github/workflows/main.yml b/.github/workflows/master-ros.yml
similarity index 71%
rename from .github/workflows/main.yml
rename to .github/workflows/master-ros.yml
index c3ba767a4..87dd5dc38 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/master-ros.yml
@@ -1,7 +1,14 @@
-name: CI
-
-on: [push, pull_request]
-
+name: CI-master
+on:
+ push:
+ branches:
+ - 'master'
+ pull_request:
+ branches:
+ - 'master'
+ workflow_dispatch:
+ branches:
+ - '*'
jobs:
industrial_ci:
strategy:
@@ -11,7 +18,7 @@ jobs:
- {ROS_DISTRO: melodic, ROS_REPO: main}
- {ROS_DISTRO: noetic, ROS_REPO: testing}
- {ROS_DISTRO: noetic, ROS_REPO: main}
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
diff --git a/.github/workflows/melodic-ros.yml b/.github/workflows/melodic-ros.yml
new file mode 100644
index 000000000..4eae42bb0
--- /dev/null
+++ b/.github/workflows/melodic-ros.yml
@@ -0,0 +1,25 @@
+name: CI-melodic
+on:
+ push:
+ branches:
+ - 'melodic'
+ pull_request:
+ branches:
+ - 'melodic'
+ workflow_dispatch:
+ branches:
+ - '*'
+jobs:
+ industrial_ci:
+ strategy:
+ matrix:
+ env:
+ - {ROS_DISTRO: melodic, ROS_REPO: testing}
+ - {ROS_DISTRO: melodic, ROS_REPO: main}
+ runs-on: ubuntu-18.04
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ submodules: recursive
+ - uses: 'ros-industrial/industrial_ci@master'
+ env: ${{matrix.env}}
diff --git a/.github/workflows/noetic-ros.yml b/.github/workflows/noetic-ros.yml
new file mode 100644
index 000000000..0326f6073
--- /dev/null
+++ b/.github/workflows/noetic-ros.yml
@@ -0,0 +1,25 @@
+name: CI-noetic
+on:
+ push:
+ branches:
+ - 'noetic'
+ pull_request:
+ branches:
+ - 'noetic'
+ workflow_dispatch:
+ branches:
+ - '*'
+jobs:
+ industrial_ci:
+ strategy:
+ matrix:
+ env:
+ - {ROS_DISTRO: noetic, ROS_REPO: testing}
+ - {ROS_DISTRO: noetic, ROS_REPO: main}
+ runs-on: ubuntu-20.04
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ submodules: recursive
+ - uses: 'ros-industrial/industrial_ci@master'
+ env: ${{matrix.env}}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 846f62ec3..08735c288 100644
--- a/CMakeLists.txt
+++ b/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)
@@ -8,6 +8,14 @@ option(BUILD_TOOLS "Build tools including lvr2_reconstruct" ON)
option(BUILD_TOOLS_EXPERIMENTAL "Build experimental tools" OFF)
option(WITH_DRACO "Build libraries with draco enabled" OFF)
+
+# DEFAULT RELEASE
+if (NOT EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt)
+ if (NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
+ endif()
+endif()
+
set_property(GLOBAL PROPERTY USE_FOLDERS On)
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
@@ -16,8 +24,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 +42,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}
)
@@ -269,11 +276,14 @@ endif(WITH_PCL)
find_package(CGAL)
if(CGAL_FOUND)
- set(_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
- set(CMAKE_CXX_FLAGS)
- # CGAL_USE_FILE overrides theses flags...
- include(${CGAL_USE_FILE})
- set(CMAKE_CXX_FLAGS "${_CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
+
+ if(DEFINED CGAL_USE_FILE)
+ # CGAL_USE_FILE overrides theses flags...
+ set(_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ set(CMAKE_CXX_FLAGS)
+ include(${CGAL_USE_FILE})
+ set(CMAKE_CXX_FLAGS "${_CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
+ endif()
message(STATUS "Found CGAL")
endif(CGAL_FOUND)
@@ -460,7 +470,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 +726,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 )
\ No newline at end of file
diff --git a/package.xml b/package.xml
index ceddd69ad..b83353fab 100644
--- a/package.xml
+++ b/package.xml
@@ -8,10 +8,10 @@ The Las Vegas Surface Reconstruction Toolkit is an Open Source toolkit to recons
Sebastian Pütz
Thomas Wiemann
+ Alexander Mock
BSD-3-Clause
-
https://www.las-vegas.uni-osnabrueck.de/
@@ -25,6 +25,7 @@ The Las Vegas Surface Reconstruction Toolkit is an Open Source toolkit to recons
Dominik Feldschnieders
Alexander Löhr
+ cmake
libflann-dev
libgsl
@@ -41,6 +42,6 @@ The Las Vegas Surface Reconstruction Toolkit is an Open Source toolkit to recons
yaml-cpp
- ament_cmake
+ cmake