Skip to content

Commit

Permalink
Mark include directories of 3rd-party libraries as system includes, t…
Browse files Browse the repository at this point in the history
…o prevent compiler warnings which are not caused by PCL code
  • Loading branch information
Heiko Thiel committed Dec 21, 2018
1 parent 214bb39 commit 21d6a98
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 20 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Expand Up @@ -296,14 +296,14 @@ if(NOT PCL_SHARED_LIBS OR ((WIN32 AND NOT MINGW) AND NOT PCL_BUILD_WITH_FLANN_DY
set(FLANN_USE_STATIC ON)
endif()
find_package(FLANN 1.7.0 REQUIRED)
include_directories(${FLANN_INCLUDE_DIRS})
include_directories(SYSTEM ${FLANN_INCLUDE_DIRS})

# libusb-1.0
option(WITH_LIBUSB "Build USB RGBD-Camera drivers" TRUE)
if(WITH_LIBUSB)
find_package(libusb-1.0)
if(LIBUSB_1_FOUND)
include_directories("${LIBUSB_1_INCLUDE_DIR}")
include_directories(SYSTEM "${LIBUSB_1_INCLUDE_DIR}")
endif()
endif()

Expand All @@ -321,7 +321,7 @@ if(PKG_CONFIG_FOUND)
pkg_check_modules(METSLIB metslib)
if(METSLIB_FOUND)
set(HAVE_METSLIB ON)
include_directories(${METSLIB_INCLUDE_DIRS})
include_directories(SYSTEM ${METSLIB_INCLUDE_DIRS})
else()
include_directories("${PCL_SOURCE_DIR}/recognition/include/pcl/recognition/3rdparty/")
endif()
Expand All @@ -335,7 +335,7 @@ if(WITH_PNG)
find_package(PNG)
if(PNG_FOUND)
set(HAVE_PNG ON)
include_directories("${PNG_INCLUDE_DIR}")
include_directories(SYSTEM "${PNG_INCLUDE_DIR}")
endif()
endif()

Expand All @@ -347,7 +347,7 @@ if(WITH_QHULL)
endif()
find_package(Qhull)
if(QHULL_FOUND)
include_directories(${QHULL_INCLUDE_DIRS})
include_directories(SYSTEM ${QHULL_INCLUDE_DIRS})
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion apps/CMakeLists.txt
Expand Up @@ -188,7 +188,7 @@ endif() # VTK_FOUND
# OpenGL and GLUT
if(OPENGL_FOUND AND GLUT_FOUND)
if(NOT WIN32)
include_directories("${OPENGL_INCLUDE_DIR}")
include_directories(SYSTEM "${OPENGL_INCLUDE_DIR}")
endif()
PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_grabcut_2d "${SUBSYS_NAME}" src/grabcut_2d.cpp)
target_link_libraries (pcl_grabcut_2d pcl_common pcl_io pcl_segmentation pcl_search GLUT::GLUT ${OPENGL_LIBRARIES})
Expand Down
Expand Up @@ -13,7 +13,7 @@ add_definitions(${PCL_DEFINITIONS})
find_package(HDF5 REQUIRED)
find_package(FLANN REQUIRED)

include_directories(
include_directories(SYSTEM
${FLANN_INCLUDE_DIRS}
${HDF5_INCLUDE_DIR}
)
Expand Down
3 changes: 2 additions & 1 deletion gpu/kinfu/CMakeLists.txt
Expand Up @@ -32,7 +32,8 @@ 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" ${CUDA_INCLUDE_DIRS})
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/src")
include_directories(SYSTEM ${CUDA_INCLUDE_DIRS})

if(UNIX OR APPLE)
set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler;-fPIC;")
Expand Down
2 changes: 1 addition & 1 deletion gpu/kinfu/tools/CMakeLists.txt
Expand Up @@ -14,7 +14,7 @@ else()
endif()

file(GLOB hdrs "*.h*")
include_directories(${VTK_INCLUDE_DIRS} ${OPENNI_INCLUDE_DIRS})
include_directories(SYSTEM ${VTK_INCLUDE_DIRS} ${OPENNI_INCLUDE_DIRS})

## KINECT FUSION
set(the_target pcl_kinfu_app)
Expand Down
2 changes: 1 addition & 1 deletion gpu/kinfu_large_scale/tools/CMakeLists.txt
Expand Up @@ -14,7 +14,7 @@ else()
endif()

file(GLOB hdrs "*.h*")
include_directories(${VTK_INCLUDE_DIRS})
include_directories(SYSTEM ${VTK_INCLUDE_DIRS})

## STANDALONE TEXTURE MAPPING
set(the_target pcl_kinfu_largeScale_texture_output)
Expand Down
5 changes: 4 additions & 1 deletion gpu/people/CMakeLists.txt
Expand Up @@ -48,11 +48,14 @@ source_group("Source files\\cuda" FILES ${srcs_cuda})
source_group("Source files" FILES ${srcs})

include_directories(
${VTK_INCLUDE_DIRS}
"${CMAKE_CURRENT_SOURCE_DIR}/include"
"${CMAKE_CURRENT_SOURCE_DIR}/src"
"${CMAKE_CURRENT_SOURCE_DIR}/src/cuda"
"${CMAKE_CURRENT_SOURCE_DIR}/src/cuda/nvidia"
)

include_directories(SYSTEM
${VTK_INCLUDE_DIRS}
${OpenCV_INCLUDE_DIRS}
${CUDA_INCLUDE_DIRS}
)
Expand Down
2 changes: 1 addition & 1 deletion gpu/people/tools/CMakeLists.txt
Expand Up @@ -11,7 +11,7 @@ endif()

set(the_target people_tracking)

include_directories(${VTK_INCLUDE_DIRS})
include_directories(SYSTEM ${VTK_INCLUDE_DIRS})

#PCL_ADD_EXECUTABLE("${the_target}" "${SUBSYS_NAME}" people_tracking.cpp)
#target_link_libraries("${the_target}" pcl_common pcl_filters pcl_kdtree pcl_segmentation pcl_kdtree pcl_gpu_people pcl_filters pcl_io pcl_visualization)
Expand Down
2 changes: 1 addition & 1 deletion gpu/surface/CMakeLists.txt
Expand Up @@ -26,7 +26,7 @@ source_group("Source Files\\cuda" FILES ${cuda})
list(APPEND srcs ${utils} ${cuda})


include_directories(${VTK_INCLUDE_DIRS})
include_directories(SYSTEM ${VTK_INCLUDE_DIRS})

set(LIB_NAME "pcl_${SUBSYS_NAME}")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/src/cuda")
Expand Down
2 changes: 1 addition & 1 deletion io/CMakeLists.txt
Expand Up @@ -249,7 +249,7 @@ endif()

if(PCAP_FOUND)
set(PCAP_DEFINES -DHAVE_PCAP)
include_directories(${PCAP_INCLUDE_DIRS})
include_directories(SYSTEM ${PCAP_INCLUDE_DIRS})
add_definitions(${PCAP_DEFINES})
endif()

Expand Down
2 changes: 1 addition & 1 deletion simulation/tools/CMakeLists.txt
Expand Up @@ -5,7 +5,7 @@ if(NOT (GLEW_FOUND AND GLUT_FOUND))
return()
endif()

include_directories(${VTK_INCLUDE_DIRS})
include_directories(SYSTEM ${VTK_INCLUDE_DIRS})

PCL_ADD_EXECUTABLE(pcl_sim_viewer ${SUBSYS_NAME} sim_viewer.cpp)
target_link_libraries (pcl_sim_viewer
Expand Down
2 changes: 1 addition & 1 deletion test/io/CMakeLists.txt
Expand Up @@ -35,7 +35,7 @@ PCL_ADD_TEST(io_ply_io test_ply_io

# Uses VTK readers to verify
if(VTK_FOUND AND NOT ANDROID)
include_directories(${VTK_INCLUDE_DIRS})
include_directories(SYSTEM ${VTK_INCLUDE_DIRS})
PCL_ADD_TEST (io_ply_mesh_io test_ply_mesh_io
FILES test_ply_mesh_io.cpp
LINK_WITH pcl_gtest pcl_io
Expand Down
2 changes: 1 addition & 1 deletion test/outofcore/CMakeLists.txt
Expand Up @@ -12,7 +12,7 @@ if(NOT build)
return()
endif()

include_directories(${VTK_INCLUDE_DIRS})
include_directories(SYSTEM ${VTK_INCLUDE_DIRS})
PCL_ADD_TEST (outofcore_test test_outofcore
FILES test_outofcore.cpp
LINK_WITH pcl_gtest pcl_common pcl_io pcl_filters pcl_outofcore pcl_visualization)
2 changes: 1 addition & 1 deletion test/people/CMakeLists.txt
Expand Up @@ -12,7 +12,7 @@ if(NOT build)
return()
endif()

include_directories(${VTK_INCLUDE_DIRS})
include_directories(SYSTEM ${VTK_INCLUDE_DIRS})
PCL_ADD_TEST(a_people_detection_test test_people_detection
FILES test_people_groundBasedPeopleDetectionApp.cpp
LINK_WITH pcl_gtest pcl_common pcl_io pcl_kdtree pcl_search pcl_features pcl_sample_consensus pcl_filters pcl_io pcl_segmentation pcl_people
Expand Down
2 changes: 1 addition & 1 deletion tools/CMakeLists.txt
Expand Up @@ -270,7 +270,7 @@ target_link_libraries (pcl_transform_from_viewpoint pcl_common pcl_io pcl_regist

find_package(tide QUIET)
if(Tide_FOUND)
include_directories(${Tide_INCLUDE_DIRS})
include_directories(SYSTEM ${Tide_INCLUDE_DIRS})
add_definitions(${Tide_DEFINITIONS})
PCL_ADD_EXECUTABLE(pcl_video "${SUBSYS_NAME}" pcl_video.cpp)
target_link_libraries(pcl_video pcl_common pcl_io pcl_visualization
Expand Down
2 changes: 1 addition & 1 deletion visualization/CMakeLists.txt
Expand Up @@ -23,7 +23,7 @@ endif()

if(OPENGL_FOUND)
if(OPENGL_INCLUDE_DIR)
include_directories("${OPENGL_INCLUDE_DIR}")
include_directories(SYSTEM "${OPENGL_INCLUDE_DIR}")
endif()
if(OPENGL_DEFINITIONS)
add_definitions("${OPENGL_DEFINITIONS}")
Expand Down

0 comments on commit 21d6a98

Please sign in to comment.