Change to use target_include_directories.

Rearranged files between gpu_utils and gpu_containers, to break cyclic includes.
larshg · Apr 17, 2024 · 426b465 · 426b465
1 parent 56499d3
commit 426b465
Show file tree

Hide file tree

Showing 43 changed files with 49 additions and 97 deletions.
diff --git a/cuda/apps/CMakeLists.txt b/cuda/apps/CMakeLists.txt
@@ -10,7 +10,6 @@ if(NOT VTK_FOUND)
 else()
   set(DEFAULT TRUE)
   set(REASON)
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 endif()
 
 PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ${DEFAULT} "${REASON}")

diff --git a/cuda/common/CMakeLists.txt b/cuda/common/CMakeLists.txt
@@ -27,7 +27,6 @@ set(common_incs
     include/pcl/cuda/common/point_type_rgb.h
     )
 
-include_directories(./include)
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
 set(EXT_DEPS CUDA)
 PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC "${SUBSYS_DESC}"

diff --git a/cuda/features/CMakeLists.txt b/cuda/features/CMakeLists.txt
@@ -23,7 +23,6 @@ set(incs
 )
 
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 PCL_CUDA_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs})
 target_link_libraries(${LIB_NAME} pcl_common)
 

diff --git a/cuda/io/CMakeLists.txt b/cuda/io/CMakeLists.txt
@@ -34,7 +34,6 @@ set(incs
 )
 
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 PCL_CUDA_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs})
 target_link_libraries(${LIB_NAME} pcl_common)
 

diff --git a/cuda/sample_consensus/CMakeLists.txt b/cuda/sample_consensus/CMakeLists.txt
@@ -32,7 +32,6 @@ set(incs
 )
 
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 PCL_CUDA_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs})
 target_link_libraries("${LIB_NAME}" pcl_cuda_features)
 

diff --git a/cuda/segmentation/CMakeLists.txt b/cuda/segmentation/CMakeLists.txt
@@ -24,7 +24,6 @@ set(srcs
 )
 
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 PCL_CUDA_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs})
 target_link_libraries(${LIB_NAME} pcl_common)
 

diff --git a/gpu/containers/CMakeLists.txt b/gpu/containers/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(SUBSYS_NAME gpu_containers)
 set(SUBSYS_PATH gpu/containers)
 set(SUBSYS_DESC "Containers with reference counting for GPU memory. This module can be compiled without Cuda Toolkit.")
-set(SUBSYS_DEPS common)
+set(SUBSYS_DEPS common gpu_utils)
 
 PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ON)
 PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS})
@@ -12,19 +12,16 @@ if(NOT build)
   return()
 endif()
 
-file(GLOB srcs src/*.cpp src/*.hpp)
+file(GLOB srcs src/*.cpp src/*.cu src/*.hpp)
 file(GLOB incs include/pcl/gpu/containers/*.h)
 file(GLOB incs_impl include/pcl/gpu/containers/impl/*.hpp)
 
 source_group("Header Files\\impl" FILES ${incs_impl})
 list(APPEND incs ${incs_impl})
 
-get_filename_component(UTILS_INC "${CMAKE_CURRENT_SOURCE_DIR}/../utils/include" REALPATH)
-
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" ${UTILS_INC})
 PCL_CUDA_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs})
-target_link_libraries(${LIB_NAME} pcl_common)
+target_link_libraries(${LIB_NAME} pcl_common pcl_gpu_utils)
 
 #Ensures that CUDA is added and the project can compile as it uses cuda calls.
 set_source_files_properties(src/device_memory.cpp PROPERTIES LANGUAGE CUDA)

diff --git a/gpu/utils/src/internal.hpp → ...lude/pcl/gpu/containers/impl/internal.hpp b/gpu/utils/src/internal.hpp → ...lude/pcl/gpu/containers/impl/internal.hpp
diff --git a/gpu/utils/include/pcl/gpu/utils/repacks.hpp → ...clude/pcl/gpu/containers/impl/repacks.hpp b/gpu/utils/include/pcl/gpu/utils/repacks.hpp → ...clude/pcl/gpu/containers/impl/repacks.hpp
diff --git a/.../include/pcl/gpu/utils/texture_binder.hpp → ...cl/gpu/containers/impl/texture_binder.hpp b/.../include/pcl/gpu/utils/texture_binder.hpp → ...cl/gpu/containers/impl/texture_binder.hpp
diff --git a/gpu/utils/src/repacks.cpp → gpu/containers/src/repacks.cpp b/gpu/utils/src/repacks.cpp → gpu/containers/src/repacks.cpp
@@ -36,6 +36,6 @@
 
 #include <cassert>
 
-#include <pcl/gpu/utils/repacks.hpp>
-#include "internal.hpp"
+#include <pcl/gpu/containers/impl/repacks.hpp>
+#include <pcl/gpu/containers/impl/internal.hpp>
 
diff --git a/gpu/utils/src/repacks.cu → gpu/containers/src/repacks.cu b/gpu/utils/src/repacks.cu → gpu/containers/src/repacks.cu
@@ -1,7 +1,8 @@
-#include "internal.hpp"
+#include <pcl/gpu/containers/impl/internal.hpp>
+#include <pcl/gpu/utils/safe_call.hpp>
+#include <pcl/pcl_exports.h>
+
 #include <algorithm>
-#include "pcl/gpu/utils/safe_call.hpp"
-#include "pcl/pcl_exports.h"
 
 namespace pcl
 {

diff --git a/gpu/features/CMakeLists.txt b/gpu/features/CMakeLists.txt
@@ -24,7 +24,6 @@ file(GLOB srcs_utils src/utils/*.hpp)
 source_group("Source Files\\utils" FILES ${srcs_utils})
 
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/src")
 PCL_CUDA_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${cuda} ${srcs_utils}  ${dev_incs})
 target_link_libraries("${LIB_NAME}" pcl_gpu_utils pcl_gpu_containers pcl_gpu_octree)
 

diff --git a/gpu/features/src/features.cpp b/gpu/features/src/features.cpp
@@ -34,7 +34,7 @@
  *  Author: Anatoly Baskeheev, Itseez Ltd, ([email protected])
  */
 
-#include <pcl/gpu/containers/initialization.h>
+#include <pcl/gpu/utils/initialization.h>
 #include <pcl/gpu/features/features.hpp>
 #include "internal.hpp"
 

diff --git a/gpu/features/test/CMakeLists.txt b/gpu/features/test/CMakeLists.txt
@@ -2,26 +2,8 @@ if(NOT BUILD_TESTS)
   return()
 endif()
 
-include_directories(
-  "${PCL_SOURCE_DIR}/test/gtest-1.6.0/include"
-  "${PCL_SOURCE_DIR}/test/gtest-1.6.0"
-)
-
-set(pcl_gtest_sources "${PCL_SOURCE_DIR}/test/gtest-1.6.0/src/gtest-all.cc")
-
 set(the_test_target test_gpu_features)
 
-get_filename_component(DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(INC1 "${DIR}/../../../io/include" REALPATH)
-get_filename_component(INC2 "${DIR}/../../../features/include" REALPATH)
-get_filename_component(INC3 "${DIR}/../../../kdtree/include" REALPATH)
-get_filename_component(INC4 "${DIR}/../../../visualization/include" REALPATH)
-get_filename_component(INC5 "${DIR}/../../../common/include" REALPATH)
-get_filename_component(INC6 "${DIR}/../../../search/include" REALPATH)
-get_filename_component(INC7 "${DIR}/../../../octree/include" REALPATH)
-
-
 file(GLOB test_src *.cpp *.hpp)
 list(APPEND test_src ${pcl_gtest_sources})
-include_directories("${INC1}" "${INC2}" "${INC3}" "${INC4}" "${INC5}" "${INC6}" "${INC7}")
-include_directories(SYSTEM ${VTK_INCLUDE_DIRS})
+
diff --git a/gpu/kinfu/CMakeLists.txt b/gpu/kinfu/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(SUBSYS_NAME gpu_kinfu)
 set(SUBSYS_PATH gpu/kinfu)
 set(SUBSYS_DESC "Kinect Fusion implementation")
-set(SUBSYS_DEPS common io gpu_containers geometry search)
+set(SUBSYS_DEPS common io gpu_utils gpu_containers geometry search)
 if(${CUDA_VERSION_STRING} VERSION_GREATER_EQUAL "12.0")
   set(DEFAULT FALSE)
   set(REASON "Kinfu uses textures which was removed in CUDA 12")
@@ -26,10 +26,10 @@ source_group("Source Files\\cuda" FILES ${cuda})
 source_group("Source Files" FILES ${srcs})
 
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/src")
 
 PCL_CUDA_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${cuda})
-target_link_libraries(${LIB_NAME} pcl_gpu_containers)
+target_link_libraries(${LIB_NAME} pcl_gpu_utils pcl_gpu_containers)
+target_include_directories(${LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 target_compile_options(${LIB_NAME} PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--ftz=true;--prec-div=false;--prec-sqrt=false>)
 

diff --git a/gpu/kinfu/src/safe_call.hpp b/gpu/kinfu/src/safe_call.hpp
@@ -38,7 +38,7 @@
 #define __PCL_CUDA_SAFE_CALL_HPP__
 
 #include "cuda_runtime_api.h"
-#include <pcl/gpu/containers/initialization.h>
+#include <pcl/gpu/utils/initialization.h>
 
 #if defined(__GNUC__)
     #define cudaSafeCall(expr)  pcl::gpu::___cudaSafeCall(expr, __FILE__, __LINE__, __func__)

diff --git a/gpu/kinfu/tools/CMakeLists.txt b/gpu/kinfu/tools/CMakeLists.txt
@@ -13,10 +13,7 @@ if(NOT build)
   return()
 endif()
 
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
-
 file(GLOB hdrs "*.h*")
-include_directories(SYSTEM ${OPENNI_INCLUDE_DIRS})
 
 ## KINECT FUSION
 set(the_target pcl_kinfu_app)

diff --git a/gpu/kinfu/tools/capture.cpp b/gpu/kinfu/tools/capture.cpp
@@ -37,7 +37,7 @@
 #include <pcl/io/openni_camera/openni.h>
 
 #include "openni_capture.h"
-#include <pcl/gpu/containers/initialization.h>
+#include <pcl/gpu/utils/initialization.h>
 
 using namespace pcl;
 using namespace pcl::gpu;

diff --git a/gpu/kinfu/tools/kinfu_app.cpp b/gpu/kinfu/tools/kinfu_app.cpp
@@ -47,7 +47,7 @@
 #include <pcl/gpu/kinfu/kinfu.h>
 #include <pcl/gpu/kinfu/raycaster.h>
 #include <pcl/gpu/kinfu/marching_cubes.h>
-#include <pcl/gpu/containers/initialization.h>
+#include <pcl/gpu/utils/initialization.h>
 
 #include <pcl/common/time.h>
 #include <pcl/point_cloud.h>

diff --git a/gpu/kinfu/tools/record_tsdfvolume.cpp b/gpu/kinfu/tools/record_tsdfvolume.cpp
@@ -46,7 +46,7 @@
 
 #include <pcl/gpu/kinfu/kinfu.h>
 #include <pcl/gpu/containers/device_array.h>
-#include <pcl/gpu/containers/initialization.h>
+#include <pcl/gpu/utils/initialization.h>
 #include "openni_capture.h"
 
 #include "../src/internal.h"

diff --git a/gpu/kinfu_large_scale/CMakeLists.txt b/gpu/kinfu_large_scale/CMakeLists.txt
@@ -29,11 +29,9 @@ source_group("Source Files\\cuda" FILES ${cuda})
 source_group("Source Files" FILES ${srcs})
 
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/src")
-
 PCL_CUDA_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs} ${cuda})
-
 target_link_libraries(${LIB_NAME} pcl_common pcl_io pcl_gpu_utils pcl_gpu_containers pcl_gpu_octree pcl_octree pcl_filters)
+target_include_directories(${LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 target_compile_options(${LIB_NAME} PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--ftz=true;--prec-div=false;--prec-sqrt=false>)
 

diff --git a/gpu/kinfu_large_scale/tools/CMakeLists.txt b/gpu/kinfu_large_scale/tools/CMakeLists.txt
@@ -13,10 +13,7 @@ if(NOT build)
   return()
 endif()
 
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
-
 file(GLOB hdrs "*.h*")
-include_directories(SYSTEM ${VTK_INCLUDE_DIRS})
 
 ## STANDALONE TEXTURE MAPPING
 set(the_target pcl_kinfu_largeScale_texture_output)

diff --git a/gpu/kinfu_large_scale/tools/kinfuLS_app.cpp b/gpu/kinfu_large_scale/tools/kinfuLS_app.cpp
@@ -59,7 +59,7 @@ Work in progress: patch by Marco (AUG,19th 2012)
 #include <pcl/gpu/kinfu_large_scale/kinfu.h>
 #include <pcl/gpu/kinfu_large_scale/raycaster.h>
 #include <pcl/gpu/kinfu_large_scale/marching_cubes.h>
-#include <pcl/gpu/containers/initialization.h>
+#include <pcl/gpu/utils/initialization.h>
 
 #include <pcl/common/time.h>
 #include <pcl/common/transforms.h> // for transformPoint

diff --git a/gpu/octree/CMakeLists.txt b/gpu/octree/CMakeLists.txt
@@ -25,9 +25,9 @@ source_group("Source Files\\cuda" FILES ${cuda})
 list(APPEND srcs ${utils} ${cuda})
 
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/src/utils")
 PCL_CUDA_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs})
 target_link_libraries("${LIB_NAME}" pcl_gpu_containers)
+target_include_directories(${LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 set(EXT_DEPS "")
 #set(EXT_DEPS CUDA)

diff --git a/gpu/octree/src/cuda/octree_host.cu b/gpu/octree/src/cuda/octree_host.cu
@@ -34,8 +34,8 @@
 *  Author: Anatoly Baskeheev, Itseez Ltd, ([email protected])
 */
 
-#include "pcl/gpu/utils/timers_cuda.hpp"
-#include "pcl/gpu/utils/safe_call.hpp"
+#include <pcl/gpu/utils/timers_cuda.hpp>
+#include <pcl/gpu/utils/safe_call.hpp>
 
 #include "internal.hpp"
 #include "utils/approx_nearest_utils.hpp"

diff --git a/gpu/people/CMakeLists.txt b/gpu/people/CMakeLists.txt
@@ -46,17 +46,18 @@ file(GLOB hdrs_cuda src/cuda/nvidia/*.h*)
 source_group("Source files\\cuda" FILES ${srcs_cuda})
 source_group("Source files" FILES ${srcs})
 
-include_directories(
-  "${CMAKE_CURRENT_SOURCE_DIR}/include"
-  "${CMAKE_CURRENT_SOURCE_DIR}/src"
-  "${CMAKE_CURRENT_SOURCE_DIR}/src/cuda"
-  "${CMAKE_CURRENT_SOURCE_DIR}/src/cuda/nvidia"
-)
-
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
 
 PCL_CUDA_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${hdrs} ${srcs_cuda})
 target_link_libraries(${LIB_NAME} pcl_common pcl_search pcl_surface pcl_segmentation pcl_features pcl_sample_consensus pcl_gpu_utils pcl_gpu_containers ${CUDA_CUDART_LIBRARY} ${CUDA_npp_LIBRARY})
+target_include_directories(
+    ${LIB_NAME} 
+    PRIVATE
+      ${CMAKE_CURRENT_SOURCE_DIR}/src 
+      ${CMAKE_CURRENT_SOURCE_DIR}/src/cuda
+    PUBLIC
+      ${CMAKE_CURRENT_SOURCE_DIR}/src/cuda/nvidia
+)
 
 if(UNIX OR APPLE)
   target_compile_options(${LIB_NAME} INTERFACE $<$<COMPILE_LANGUAGE:CUDA>:"-Xcompiler=-fPIC">)

diff --git a/gpu/people/src/cuda/elec.cu b/gpu/people/src/cuda/elec.cu
@@ -1,6 +1,6 @@
 #include "internal.h"
 
-#include <pcl/gpu/utils/texture_binder.hpp>
+#include <pcl/gpu/containers/impl/texture_binder.hpp>
 #include <pcl/gpu/utils/device/block.hpp>
 
 #include <cassert>

diff --git a/gpu/people/src/cuda/multi_tree.cu b/gpu/people/src/cuda/multi_tree.cu
@@ -41,7 +41,7 @@
 #include <pcl/gpu/people/tree.h>
 #include <pcl/gpu/people/label_common.h>
 #include <pcl/gpu/utils/safe_call.hpp>
-#include <pcl/gpu/utils/texture_binder.hpp>
+#include <pcl/gpu/containers/impl/texture_binder.hpp>
 #include <stdio.h>
 #include <limits>
 #include <assert.h>

diff --git a/gpu/people/src/cuda/prob.cu b/gpu/people/src/cuda/prob.cu
@@ -41,7 +41,7 @@
 #include <pcl/gpu/people/tree.h>
 #include <pcl/gpu/people/label_common.h>
 #include <pcl/gpu/utils/safe_call.hpp>
-#include <pcl/gpu/utils/texture_binder.hpp>
+#include <pcl/gpu/containers/impl/texture_binder.hpp>
 #include <stdio.h>
 #include <limits>
 #include <assert.h>

diff --git a/gpu/people/src/cuda/utils.cu b/gpu/people/src/cuda/utils.cu
@@ -2,7 +2,7 @@
 
 #include "internal.h"
 #include <pcl/gpu/utils/safe_call.hpp>
-#include <pcl/gpu/utils/texture_binder.hpp>
+#include <pcl/gpu/containers/impl/texture_binder.hpp>
 #include "npp.h"
 
 #include <stdio.h>

diff --git a/gpu/people/tools/CMakeLists.txt b/gpu/people/tools/CMakeLists.txt
@@ -6,13 +6,10 @@ if(NOT VTK_FOUND)
 else()
   set(DEFAULT TRUE)
   set(REASON)
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 endif()
 
 set(the_target people_tracking)
 
-include_directories(SYSTEM ${VTK_INCLUDE_DIRS})
-
 #PCL_ADD_EXECUTABLE(${the_target} "${SUBSYS_NAME}" people_tracking.cpp)
 #target_link_libraries("${the_target}" pcl_common pcl_kdtree pcl_gpu_people pcl_io pcl_visualization)
 

diff --git a/gpu/people/tools/people_app.cpp b/gpu/people/tools/people_app.cpp
@@ -46,7 +46,7 @@
 #include <pcl/exceptions.h>
 #include <pcl/console/parse.h>
 #include <pcl/console/print.h>
-#include <pcl/gpu/containers/initialization.h>
+#include <pcl/gpu/utils/initialization.h>
 #include <pcl/gpu/people/people_detector.h>
 #include <pcl/gpu/people/colormap.h>
 #include <pcl/visualization/image_viewer.h>

diff --git a/gpu/segmentation/CMakeLists.txt b/gpu/segmentation/CMakeLists.txt
@@ -31,7 +31,6 @@ set(impl_incs
 )
 
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs})
 target_link_libraries("${LIB_NAME}" pcl_common pcl_gpu_octree pcl_gpu_utils pcl_gpu_containers)
 PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS})

diff --git a/gpu/surface/CMakeLists.txt b/gpu/surface/CMakeLists.txt
@@ -25,9 +25,9 @@ source_group("Source Files\\cuda" FILES ${cuda})
 list(APPEND srcs ${utils} ${cuda})
 
 set(LIB_NAME "pcl_${SUBSYS_NAME}")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/src/cuda")
 PCL_CUDA_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs})
-target_link_libraries("${LIB_NAME}" pcl_gpu_containers)
+target_link_libraries(${LIB_NAME} pcl_gpu_containers)
+target_include_directories(${LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 set(EXT_DEPS "")
 #set(EXT_DEPS CUDA)

diff --git a/gpu/surface/test/CMakeLists.txt b/gpu/surface/test/CMakeLists.txt
@@ -4,18 +4,6 @@ endif()
 
 set(the_test_target test_gpu_surface)
 
-get_filename_component(DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(INC_SURF "${DIR}/../../surface/include" REALPATH)
-get_filename_component(INC_IO "${DIR}/../../../io/include" REALPATH)
-get_filename_component(INC_VIZ "${DIR}/../../../visualization/include" REALPATH)
-get_filename_component(INC_GEO "${DIR}/../../../geometry/include" REALPATH)
-get_filename_component(INC_SURF_CPU "${DIR}/../../../surface/include" REALPATH)
-get_filename_component(INC_SEA "${DIR}/../../../search/include" REALPATH)
-get_filename_component(INC_KD "${DIR}/../../../kdtree/include" REALPATH)
-get_filename_component(INC_OCT "${DIR}/../../../octree/include" REALPATH)
-include_directories("${INC_SURF}" "${INC_IO}" "${INC_VIZ}" "${INC_GEO}" "${INC_SURF_CPU}" "${INC_SEA}" "${INC_KD}" "${INC_OCT}")
-include_directories(SYSTEM ${VTK_INCLUDE_DIRS})
-
 file(GLOB test_src *.cpp *.hpp)
 #PCL_ADD_TEST(a_gpu_surface_test ${the_test_target} FILES ${test_src} LINK_WITH pcl_io pcl_gpu_containers pcl_gpu_surface pcl_visualization pcl_surface pcl_octree pcl_kdtree pcl_search)
 #add_dependencies(${the_test_target} pcl_io pcl_gpu_containes pcl_gpu_surface pcl_visualization)