fix include paths and include dir names in CMakeLists

PRBonn · Nov 20, 2024 · 8a3be25 · 8a3be25
1 parent d402bee
commit 8a3be25
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 26 deletions.
diff --git a/cpp/kiss_icp/include/kiss_icp/core/Registration.hpp b/cpp/kiss_icp/include/kiss_icp/core/Registration.hpp
@@ -26,7 +26,7 @@
 #include <sophus/se3.hpp>
 #include <vector>
 
-#include "VoxelHashMap.hpp"
+#include "kiss_icp/core/VoxelHashMap.hpp"
 
 namespace kiss_icp {
 

diff --git a/cpp/kiss_icp/include/kiss_icp/core/VoxelHashMap.hpp b/cpp/kiss_icp/include/kiss_icp/core/VoxelHashMap.hpp
@@ -32,7 +32,7 @@
 #include <sophus/se3.hpp>
 #include <vector>
 
-#include "VoxelUtils.hpp"
+#include "kiss_icp/core/VoxelUtils.hpp"
 
 namespace kiss_icp {
 struct VoxelHashMap {

diff --git a/cpp/kiss_icp/include/kiss_icp/pipeline/KissICP.hpp b/cpp/kiss_icp/include/kiss_icp/pipeline/KissICP.hpp
@@ -26,9 +26,9 @@
 #include <tuple>
 #include <vector>
 
-#include "Registration.hpp"
-#include "Threshold.hpp"
-#include "VoxelHashMap.hpp"
+#include "kiss_icp/core/Registration.hpp"
+#include "kiss_icp/core/Threshold.hpp"
+#include "kiss_icp/core/VoxelHashMap.hpp"
 
 namespace kiss_icp::pipeline {
 

diff --git a/cpp/kiss_icp/src/core/CMakeLists.txt b/cpp/kiss_icp/src/core/CMakeLists.txt
@@ -23,8 +23,8 @@
 add_library(kiss_icp_core STATIC)
 target_sources(kiss_icp_core PRIVATE Registration.cpp Deskew.cpp VoxelHashMap.cpp VoxelUtils.cpp Preprocessing.cpp
                                      Threshold.cpp)
-target_include_directories(kiss_icp_core PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/kiss_icp/core>
-                                                $<INSTALL_INTERFACE:include/kiss_icp/core>)
+target_include_directories(kiss_icp_core PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+                                                $<INSTALL_INTERFACE:include>)
 target_link_libraries(kiss_icp_core PUBLIC Eigen3::Eigen tsl::robin_map Sophus::Sophus)
 target_link_libraries(kiss_icp_core PRIVATE TBB::tbb)
 set_global_target_properties(kiss_icp_core)

diff --git a/cpp/kiss_icp/src/core/Deskew.cpp b/cpp/kiss_icp/src/core/Deskew.cpp
@@ -20,7 +20,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-#include "Deskew.hpp"
+#include "kiss_icp/core/Deskew.hpp"
 
 #include <tbb/parallel_for.h>
 

diff --git a/cpp/kiss_icp/src/core/Preprocessing.cpp b/cpp/kiss_icp/src/core/Preprocessing.cpp
@@ -20,7 +20,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-#include "Preprocessing.hpp"
+#include "kiss_icp/core/Preprocessing.hpp"
 
 #include <tsl/robin_map.h>
 

diff --git a/cpp/kiss_icp/src/core/Registration.cpp b/cpp/kiss_icp/src/core/Registration.cpp
@@ -20,7 +20,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-#include "Registration.hpp"
+#include "kiss_icp/core/Registration.hpp"
 
 #include <tbb/blocked_range.h>
 #include <tbb/global_control.h>
@@ -35,8 +35,8 @@
 #include <sophus/so3.hpp>
 #include <tuple>
 
-#include "VoxelHashMap.hpp"
-#include "VoxelUtils.hpp"
+#include "kiss_icp/core/VoxelHashMap.hpp"
+#include "kiss_icp/core/VoxelUtils.hpp"
 
 namespace Eigen {
 using Matrix6d = Eigen::Matrix<double, 6, 6>;

diff --git a/cpp/kiss_icp/src/core/Threshold.cpp b/cpp/kiss_icp/src/core/Threshold.cpp
@@ -20,7 +20,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-#include "Threshold.hpp"
+#include "kiss_icp/core/Threshold.hpp"
 
 #include <Eigen/Geometry>
 #include <cmath>

diff --git a/cpp/kiss_icp/src/core/VoxelHashMap.cpp b/cpp/kiss_icp/src/core/VoxelHashMap.cpp
@@ -20,14 +20,14 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-#include "VoxelHashMap.hpp"
+#include "kiss_icp/core/VoxelHashMap.hpp"
 
 #include <Eigen/Core>
 #include <algorithm>
 #include <sophus/se3.hpp>
 #include <vector>
 
-#include "VoxelUtils.hpp"
+#include "kiss_icp/core/VoxelUtils.hpp"
 
 namespace {
 using kiss_icp::Voxel;

diff --git a/cpp/kiss_icp/src/core/VoxelUtils.cpp b/cpp/kiss_icp/src/core/VoxelUtils.cpp
@@ -1,4 +1,4 @@
-#include "VoxelUtils.hpp"
+#include "kiss_icp/core/VoxelUtils.hpp"
 
 #include <tsl/robin_map.h>
 

diff --git a/cpp/kiss_icp/src/metrics/CMakeLists.txt b/cpp/kiss_icp/src/metrics/CMakeLists.txt
@@ -22,8 +22,8 @@
 # SOFTWARE.
 add_library(kiss_icp_metrics STATIC)
 target_sources(kiss_icp_metrics PRIVATE Metrics.cpp)
-target_include_directories(kiss_icp_metrics PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/kiss_icp/metrics>
-                                                   $<INSTALL_INTERFACE:include/kiss_icp/metrics>)
+target_include_directories(kiss_icp_metrics PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+                                                   $<INSTALL_INTERFACE:include>)
 target_link_libraries(kiss_icp_metrics PUBLIC Eigen3::Eigen)
 set_global_target_properties(kiss_icp_metrics)
 

diff --git a/cpp/kiss_icp/src/metrics/Metrics.cpp b/cpp/kiss_icp/src/metrics/Metrics.cpp
@@ -20,7 +20,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-#include "Metrics.hpp"
+#include "kiss_icp/metrics/Metrics.hpp"
 
 #include <Eigen/Core>
 #include <Eigen/Geometry>

diff --git a/cpp/kiss_icp/src/pipeline/CMakeLists.txt b/cpp/kiss_icp/src/pipeline/CMakeLists.txt
@@ -23,8 +23,8 @@
 
 add_library(kiss_icp_pipeline STATIC)
 target_sources(kiss_icp_pipeline PRIVATE KissICP.cpp)
-target_include_directories(kiss_icp_pipeline PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/kiss_icp/pipeline>
-                                                    $<INSTALL_INTERFACE:include/kiss_icp/pipeline>)
+target_include_directories(kiss_icp_pipeline PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+                                                    $<INSTALL_INTERFACE:include>)
 target_link_libraries(kiss_icp_pipeline PUBLIC kiss_icp_core)
 set_global_target_properties(kiss_icp_pipeline)
 

diff --git a/cpp/kiss_icp/src/pipeline/KissICP.cpp b/cpp/kiss_icp/src/pipeline/KissICP.cpp
@@ -21,15 +21,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "KissICP.hpp"
+#include "kiss_icp/pipeline/KissICP.hpp"
 
 #include <Eigen/Core>
 #include <vector>
 
-#include "Deskew.hpp"
-#include "Preprocessing.hpp"
-#include "Registration.hpp"
-#include "VoxelHashMap.hpp"
+#include "kiss_icp/core/Deskew.hpp"
+#include "kiss_icp/core/Preprocessing.hpp"
+#include "kiss_icp/core/Registration.hpp"
+#include "kiss_icp/core/VoxelHashMap.hpp"
 
 namespace kiss_icp::pipeline {