From e540eacf8833fb6e901026f410ca66a624dbaf86 Mon Sep 17 00:00:00 2001 From: Heiko Thiel Date: Fri, 30 Nov 2018 14:50:58 +0100 Subject: [PATCH] Trim trailing spaces --- 2d/CMakeLists.txt | 4 +- apps/3d_rec_framework/CMakeLists.txt | 28 ++-- apps/cloud_composer/CMakeLists.txt | 48 +++--- apps/cloud_composer/ComposerTool.cmake | 8 +- apps/modeler/CMakeLists.txt | 2 +- apps/optronic_viewer/CMakeLists.txt | 2 +- cmake/CudaComputeTargetFlags.cmake | 34 ++-- cmake/Modules/FindFZAPI.cmake | 8 +- cmake/Modules/FindGLEW.cmake | 12 +- cmake/Modules/FindGTSAM.cmake | 4 +- cmake/Modules/FindQVTK.cmake | 2 +- cmake/Modules/Findlibusb-1.0.cmake | 4 +- cmake/Modules/NSIS.template.in | 148 +++++++++--------- cmake/cpack_options.cmake.in | 2 +- cmake/dep_graph.cmake | 2 +- cmake/pcl_all_in_one_installer.cmake | 18 +-- cmake/pcl_cpack.cmake | 8 +- cmake/pcl_find_boost.cmake | 2 +- cmake/pcl_find_cuda.cmake | 2 +- cmake/pcl_pclconfig.cmake | 2 +- cmake/pcl_targets.cmake | 28 ++-- cmake/pcl_utils.cmake | 16 +- cmake/pkgconfig-headeronly.cmake.in | 2 +- common/CMakeLists.txt | 16 +- cuda/CMakeLists.txt | 2 +- cuda/apps/CMakeLists.txt | 2 +- cuda/common/CMakeLists.txt | 4 +- doc/doxygen/CMakeLists.txt | 2 +- doc/doxygen/doxyfile.in | 62 ++++---- doc/tutorials/content/sources/CMakeLists.txt | 4 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../supervoxel_clustering/CMakeLists.txt | 2 +- .../sources/vfh_recognition/CMakeLists.txt | 6 +- .../sources/vfh_recognition/FindFLANN.cmake | 8 +- examples/keypoints/CMakeLists.txt | 4 +- examples/segmentation/CMakeLists.txt | 2 +- examples/stereo/CMakeLists.txt | 6 +- examples/surface/CMakeLists.txt | 22 +-- features/CMakeLists.txt | 8 +- gpu/CMakeLists.txt | 6 +- gpu/features/CMakeLists.txt | 6 +- gpu/features/test/CMakeLists.txt | 16 +- gpu/kinfu/tools/CMakeLists.txt | 4 +- gpu/kinfu_large_scale/CMakeLists.txt | 42 ++--- gpu/kinfu_large_scale/tools/CMakeLists.txt | 6 +- gpu/octree/CMakeLists.txt | 4 +- gpu/octree/test/CMakeLists.txt | 2 +- gpu/people/CMakeLists.txt | 4 +- gpu/surface/CMakeLists.txt | 10 +- gpu/surface/test/CMakeLists.txt | 10 +- gpu/tracking/CMakeLists.txt | 6 +- gpu/utils/CMakeLists.txt | 8 +- kdtree/CMakeLists.txt | 6 +- keypoints/CMakeLists.txt | 8 +- ml/CMakeLists.txt | 4 +- octree/CMakeLists.txt | 6 +- outofcore/CMakeLists.txt | 4 +- outofcore/tools/CMakeLists.txt | 8 +- people/CMakeLists.txt | 4 +- recognition/CMakeLists.txt | 12 +- registration/CMakeLists.txt | 4 +- sample_consensus/CMakeLists.txt | 6 +- segmentation/CMakeLists.txt | 6 +- simulation/CMakeLists.txt | 6 +- simulation/tools/CMakeLists.txt | 20 +-- surface/CMakeLists.txt | 24 +-- surface/src/on_nurbs/on_nurbs.cmake | 2 +- test/CMakeLists.txt | 2 +- test/features/CMakeLists.txt | 2 +- test/registration/CMakeLists.txt | 2 +- test/segmentation/CMakeLists.txt | 2 +- tools/CMakeLists.txt | 38 ++--- tracking/CMakeLists.txt | 6 +- visualization/CMakeLists.txt | 14 +- visualization/tools/CMakeLists.txt | 6 +- 77 files changed, 429 insertions(+), 429 deletions(-) diff --git a/2d/CMakeLists.txt b/2d/CMakeLists.txt index ac79eed27a2..b07199d6e50 100644 --- a/2d/CMakeLists.txt +++ b/2d/CMakeLists.txt @@ -11,7 +11,7 @@ PCL_ADD_DOC("${SUBSYS_NAME}") if(build) set(srcs - src/convolution_2d.cpp + src/convolution_2d.cpp ) set(incs @@ -41,5 +41,5 @@ if(build) #Install include files PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs}) PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs}) - + endif() diff --git a/apps/3d_rec_framework/CMakeLists.txt b/apps/3d_rec_framework/CMakeLists.txt index b2ed5e222dd..3b3659a8f58 100644 --- a/apps/3d_rec_framework/CMakeLists.txt +++ b/apps/3d_rec_framework/CMakeLists.txt @@ -2,7 +2,7 @@ set(SUBSUBSYS_NAME 3d_rec_framework) set(SUBSUBSYS_DESC "3D recognition framework") set(SUBSUBSYS_DEPS common geometry io filters sample_consensus segmentation visualization kdtree features surface octree registration keypoints tracking search recognition ml) -# Find VTK +# Find VTK if(NOT VTK_FOUND) set(DEFAULT AUTO_OFF) set(REASON "VTK was not found.") @@ -40,7 +40,7 @@ if(build) "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/feature_wrapper/global/crh_estimator.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/feature_wrapper/global/global_estimator.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/feature_wrapper/global/ourcvfh_estimator.h") - + set(incs_fw_local "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/feature_wrapper/local/local_estimator.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/feature_wrapper/local/fpfh_local_estimator.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/feature_wrapper/local/fpfh_local_estimator_omp.h" @@ -50,29 +50,29 @@ if(build) set(incs_pc_source "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pc_source/source.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pc_source/mesh_source.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pc_source/registered_views_source.h") - + set(incs_pipelines "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pipeline/global_nn_classifier.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pipeline/global_nn_recognizer_crh.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pipeline/global_nn_recognizer_cvfh.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pipeline/local_recognizer.h") - + set(incc_tools_framework "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/tools/openni_frame_source.h") - + set(incs_utils "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/utils/metrics.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/utils/persistence_utils.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/utils/vtk_model_sampling.h") - + set(srcs src/pipeline/global_nn_classifier.cpp src/pipeline/global_nn_recognizer_crh.cpp src/pipeline/global_nn_recognizer_cvfh.cpp - src/pipeline/local_recognizer.cpp + src/pipeline/local_recognizer.cpp src/tools/openni_frame_source.cpp) - + set(impl_incs_pipeline "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pipeline/impl/global_nn_classifier.hpp" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pipeline/impl/global_nn_recognizer_crh.hpp" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pipeline/impl/global_nn_recognizer_cvfh.hpp" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pipeline/impl/local_recognizer.hpp") - + # Install include files PCL_ADD_INCLUDES("${SUBSUBSYS_NAME}" "${SUBSYS_NAME}/${SUBSUBSYS_NAME}/feature_wrapper" ${incs_fw}) PCL_ADD_INCLUDES("${SUBSUBSYS_NAME}" "${SUBSYS_NAME}/${SUBSUBSYS_NAME}/feature_wrapper/global" ${incs_fw_global}) @@ -81,13 +81,13 @@ if(build) PCL_ADD_INCLUDES("${SUBSUBSYS_NAME}" "${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pipeline" ${incs_pipelines}) PCL_ADD_INCLUDES("${SUBSUBSYS_NAME}" "${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pc_source" ${incs_pc_source}) PCL_ADD_INCLUDES("${SUBSUBSYS_NAME}" "${SUBSYS_NAME}/${SUBSUBSYS_NAME}/utils" ${incs_utils}) - + PCL_ADD_INCLUDES("${SUBSUBSYS_NAME}" "${SUBSYS_NAME}/${SUBSUBSYS_NAME}/pipeline/impl" ${impl_incs_pipeline}) - + set(LIB_NAME "pcl_${SUBSUBSYS_NAME}") PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSUBSYS_NAME}" ${srcs} ${impl_incs_pipeline} ${incs_utils} ${incs_fw} ${incs_fw_global} ${incs_fw_local} ${incc_tools_framework} ${incs_pipelines} ${incs_pc_source}) target_link_libraries("${LIB_NAME}" pcl_apps pcl_common pcl_io pcl_filters pcl_visualization pcl_segmentation pcl_surface pcl_features pcl_sample_consensus pcl_search) - + if(WITH_OPENNI) target_link_libraries("${LIB_NAME}" ${OPENNI_LIBRARIES}) if(NOT WIN32) @@ -95,9 +95,9 @@ if(build) target_link_libraries("${LIB_NAME}" ${LIBUSB_1_LIBRARIES}) endif() endif() - + PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSUBSYS_NAME}" "${SUBSUBSYS_DESC}" "" "" "" "" "") - + add_subdirectory(tools) endif() diff --git a/apps/cloud_composer/CMakeLists.txt b/apps/cloud_composer/CMakeLists.txt index f351c90b406..55d5cf592b2 100644 --- a/apps/cloud_composer/CMakeLists.txt +++ b/apps/cloud_composer/CMakeLists.txt @@ -1,5 +1,5 @@ #Disable some warnings which are all over Qt headers and make finding error messages hell -#if(${CMAKE_CXX_FLAGS} MATCHES "-Wconversion") +#if(${CMAKE_CXX_FLAGS} MATCHES "-Wconversion") # string(REGEX REPLACE "-Wconversion(.+)" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") #endif() @@ -7,7 +7,7 @@ set(SUBSUBSYS_NAME cloud_composer) set(SUBSUBSYS_DESC "Cloud Composer - Application for Manipulating Point Clouds") set(SUBSUBSYS_DEPS common io visualization filters apps) -# Find VTK +# Find VTK if(NOT VTK_FOUND) set(DEFAULT AUTO_OFF) set(REASON "VTK was not found.") @@ -48,7 +48,7 @@ PCL_ADD_DOC(${SUBSUBSYS_NAME}) if(build) include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include") - + #Sources & Headers for main application set(incs "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/qt.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/cloud_composer.h" @@ -66,8 +66,8 @@ if(build) "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/signal_multiplexer.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/merge_selection.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/transform_clouds.h") - - set(srcs src/main.cpp + + set(srcs src/main.cpp src/cloud_composer.cpp src/project_model.cpp src/cloud_viewer.cpp @@ -82,42 +82,42 @@ if(build) src/merge_selection.cpp src/tool_interface/abstract_tool.cpp src/transform_clouds.cpp) - + set(impl_incs "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/impl/cloud_item.hpp" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/impl/merge_selection.hpp" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/impl/transform_clouds.hpp") - - #Sources and headers for item types + + #Sources and headers for item types set(item_incs "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/items/cloud_composer_item.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/items/cloud_item.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/items/normals_item.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/items/fpfh_item.h") - + set(item_srcs src/items/cloud_composer_item.cpp src/items/cloud_item.cpp src/items/normals_item.cpp src/items/fpfh_item.cpp) - + #Sources and headers for point selectors set(selector_incs "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/point_selectors/interactor_style_switch.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/point_selectors/rectangular_frustum_selector.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/point_selectors/selected_trackball_interactor_style.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/point_selectors/click_trackball_interactor_style.h") - + set(selector_srcs src/point_selectors/interactor_style_switch.cpp src/point_selectors/selection_event.cpp src/point_selectors/rectangular_frustum_selector.cpp src/point_selectors/selected_trackball_interactor_style.cpp src/point_selectors/click_trackball_interactor_style.cpp src/point_selectors/manipulation_event.cpp) - + set(uis src/cloud_composer_main_window.ui) set(resources resources/resources.qrc) QT4_WRAP_UI(cloud_composer_ui ${uis}) QT4_WRAP_CPP(cloud_composer_moc ${incs} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) QT4_ADD_RESOURCES(resource_srcs ${resources}) - + set(EXE_NAME "pcl_${SUBSUBSYS_NAME}") PCL_ADD_EXECUTABLE("${EXE_NAME}" "${SUBSUBSYS_NAME}" ${cloud_composer_ui} ${cloud_composer_moc} ${srcs} ${resource_srcs} ${item_srcs} ${selector_srcs} ${impl_incs}) target_link_libraries("${EXE_NAME}" pcl_common pcl_io pcl_visualization pcl_filters ${QVTK_LIBRARY} ${QT_LIBRARIES}) @@ -125,9 +125,9 @@ if(build) # Install include files PCL_ADD_INCLUDES("${SUBSUBSYS_NAME}" "${SUBSUBSYS_NAME}" ${incs} ${item_incs} ${selector_incs}) PCL_ADD_INCLUDES("${SUBSUBSYS_NAME}" "${SUBSUBSYS_NAME}/impl" ${impl_incs}) - + PCL_MAKE_PKGCONFIG("${EXE_NAME}" "${SUBSUBSYS_NAME}" "${SUBSYS_DESC}" "" "" "" "" "") - + #TOOL buildING SCRIPTS #Create subdirectory for plugin libs @@ -136,7 +136,7 @@ if(build) set(INTERFACE_HEADERS "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/tool_interface/abstract_tool.h") set(INTERFACE_SOURCES src/tool_interface/abstract_tool.cpp) - + QT4_WRAP_CPP(INTERFACE_HEADERS_MOC ${INTERFACE_HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) PCL_ADD_LIBRARY(pcl_cc_tool_interface "${SUBSUBSYS_NAME}" ${INTERFACE_SOURCES} ${INTERFACE_HEADERS_MOC}) target_link_libraries(pcl_cc_tool_interface pcl_common ${QT_LIBRARIES}) @@ -144,15 +144,15 @@ if(build) if(APPLE) SET_TARGET_PROPERTIES(pcl_cc_tool_interface PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") endif() - + include(ComposerTool.cmake REQUIRED) - + #FPFH Tool set(FPFH_DEPS pcl_features pcl_kdtree pcl_filters) set(FPFH_SOURCES tools/fpfh_estimation.cpp) set(FPFH_HEADERS "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/tools/fpfh_estimation.h") define_composer_tool (fpfh_estimation "${FPFH_SOURCES}" "${FPFH_HEADERS}" "${FPFH_DEPS}") - + #Normals Tool set(NORMALS_DEPS pcl_features pcl_kdtree) set(NORMALS_SOURCES tools/normal_estimation.cpp) @@ -164,31 +164,31 @@ if(build) set(EC_SOURCES tools/euclidean_clustering.cpp) set(EC_HEADERS "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/tools/euclidean_clustering.h") define_composer_tool (euclidean_clustering "${EC_SOURCES}" "${EC_HEADERS}" "${EC_DEPS}") - + #Statistical Outlier Removal Tool set(SOR_DEPS pcl_filters) set(SOR_SOURCES tools/statistical_outlier_removal.cpp) set(SOR_HEADERS "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/tools/statistical_outlier_removal.h") define_composer_tool (statistical_outlier_removal "${SOR_SOURCES}" "${SOR_HEADERS}" "${SOR_DEPS}") - + #Vox Grid Downsample Tool set(VOXDS_DEPS pcl_filters) set(VOXDS_SOURCES tools/voxel_grid_downsample.cpp) set(VOXDS_HEADERS "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/tools/voxel_grid_downsample.h") define_composer_tool (voxel_grid_downsample "${VOXDS_SOURCES}" "${VOXDS_HEADERS}" "${VOXDS_DEPS}") - + #Organized Segmentation set(OSEG_DEPS pcl_segmentation pcl_kdtree) set(OSEG_SOURCES tools/organized_segmentation.cpp "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/tools/impl/organized_segmentation.hpp") set(OSEG_HEADERS "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/tools/organized_segmentation.h") define_composer_tool (organized_segmentation "${OSEG_SOURCES}" "${OSEG_HEADERS}" "${OSEG_DEPS}") - + #Sanitize Cloud Tool set(SAN_DEPS pcl_filters) set(SAN_SOURCES tools/sanitize_cloud.cpp) set(SAN_HEADERS "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/tools/sanitize_cloud.h") define_composer_tool (sanitize_cloud "${SAN_SOURCES}" "${SAN_HEADERS}" "${SAN_DEPS}") - + #Supervoxels set(VSP_DEPS pcl_octree pcl_segmentation) set(VSP_SOURCES tools/supervoxels.cpp "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/tools/impl/supervoxels.hpp") diff --git a/apps/cloud_composer/ComposerTool.cmake b/apps/cloud_composer/ComposerTool.cmake index 6a0c2caa7af..12983275fa4 100644 --- a/apps/cloud_composer/ComposerTool.cmake +++ b/apps/cloud_composer/ComposerTool.cmake @@ -1,6 +1,6 @@ # Template to make a tool function(define_composer_tool TOOL_NAME TOOL_SOURCES TOOL_HEADERS DEPS) - + project(pcl_cc_tool_${TOOL_NAME}) #message("Making plugin " pcl_cc_tool_${TOOL_NAME}) @@ -18,12 +18,12 @@ function(define_composer_tool TOOL_NAME TOOL_SOURCES TOOL_HEADERS DEPS) add_definitions(-DQT_PLUGIN) add_definitions(-DQT_NO_DEBUG) add_definitions(-DQT_SHARED) - + add_dependencies(${TOOL_TARGET} pcl_cc_tool_interface ${DEPS}) - target_link_libraries(${TOOL_TARGET} pcl_cc_tool_interface pcl_common pcl_io ${DEPS} ${QT_LIBRARIES}) + target_link_libraries(${TOOL_TARGET} pcl_cc_tool_interface pcl_common pcl_io ${DEPS} ${QT_LIBRARIES}) if(APPLE) SET_TARGET_PROPERTIES(${TOOL_TARGET} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") endif() - + endfunction(define_composer_tool TOOL_NAME TOOL_SOURCES TOOL_HEADERS DEPS) diff --git a/apps/modeler/CMakeLists.txt b/apps/modeler/CMakeLists.txt index 1dfb6e4be30..90237e76291 100644 --- a/apps/modeler/CMakeLists.txt +++ b/apps/modeler/CMakeLists.txt @@ -45,7 +45,7 @@ PCL_ADD_DOC("${SUBSUBSYS_NAME}") if(build) include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include") - # Set Qt files and resources here + # Set Qt files and resources here set(uis main_window.ui) set(moc_incs "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/main_window.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/scene_tree.h" diff --git a/apps/optronic_viewer/CMakeLists.txt b/apps/optronic_viewer/CMakeLists.txt index e0d88fea7bb..548acc7ca56 100644 --- a/apps/optronic_viewer/CMakeLists.txt +++ b/apps/optronic_viewer/CMakeLists.txt @@ -48,7 +48,7 @@ if(build) include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include") - # Set Qt files and resources here + # Set Qt files and resources here # set(uis main_window.ui) set(moc_incs "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/main_window.h" "include/pcl/${SUBSYS_NAME}/${SUBSUBSYS_NAME}/filter_window.h" diff --git a/cmake/CudaComputeTargetFlags.cmake b/cmake/CudaComputeTargetFlags.cmake index 3c88722cc2b..2af1c2f947f 100644 --- a/cmake/CudaComputeTargetFlags.cmake +++ b/cmake/CudaComputeTargetFlags.cmake @@ -1,41 +1,41 @@ # # Compute target flags macros by Anatoly Baksheev -# +# # Usage in CmakeLists.txt: # include(CudaComputeTargetFlags.cmake) -# APPEND_TARGET_ARCH_FLAGS() +# APPEND_TARGET_ARCH_FLAGS() #compute flags macros MACRO(CUDA_COMPUTE_TARGET_FLAGS arch_bin arch_ptx cuda_nvcc_target_flags) string(REGEX REPLACE "\\." "" ARCH_BIN_WITHOUT_DOTS "${${arch_bin}}") string(REGEX REPLACE "\\." "" ARCH_PTX_WITHOUT_DOTS "${${arch_ptx}}") - - set(cuda_computer_target_flags_temp "") - + + set(cuda_computer_target_flags_temp "") + # Tell NVCC to add binaries for the specified GPUs string(REGEX MATCHALL "[0-9()]+" ARCH_LIST "${ARCH_BIN_WITHOUT_DOTS}") foreach(ARCH IN LISTS ARCH_LIST) if(ARCH MATCHES "([0-9]+)\\(([0-9]+)\\)") - # User explicitly specified PTX for the concrete BIN - set(cuda_computer_target_flags_temp ${cuda_computer_target_flags_temp} -gencode arch=compute_${CMAKE_MATCH_2},code=sm_${CMAKE_MATCH_1}) - else() - # User didn't explicitly specify PTX for the concrete BIN, we assume PTX=BIN - set(cuda_computer_target_flags_temp ${cuda_computer_target_flags_temp} -gencode arch=compute_${ARCH},code=sm_${ARCH}) + # User explicitly specified PTX for the concrete BIN + set(cuda_computer_target_flags_temp ${cuda_computer_target_flags_temp} -gencode arch=compute_${CMAKE_MATCH_2},code=sm_${CMAKE_MATCH_1}) + else() + # User didn't explicitly specify PTX for the concrete BIN, we assume PTX=BIN + set(cuda_computer_target_flags_temp ${cuda_computer_target_flags_temp} -gencode arch=compute_${ARCH},code=sm_${ARCH}) endif() endforeach() - + # Tell NVCC to add PTX intermediate code for the specified architectures string(REGEX MATCHALL "[0-9]+" ARCH_LIST "${ARCH_PTX_WITHOUT_DOTS}") - foreach(ARCH IN LISTS ARCH_LIST) - set(cuda_computer_target_flags_temp ${cuda_computer_target_flags_temp} -gencode arch=compute_${ARCH},code=compute_${ARCH}) - endforeach() - - set(${cuda_nvcc_target_flags} ${cuda_computer_target_flags_temp}) + foreach(ARCH IN LISTS ARCH_LIST) + set(cuda_computer_target_flags_temp ${cuda_computer_target_flags_temp} -gencode arch=compute_${ARCH},code=compute_${ARCH}) + endforeach() + + set(${cuda_nvcc_target_flags} ${cuda_computer_target_flags_temp}) ENDMACRO() MACRO(APPEND_TARGET_ARCH_FLAGS) set(cuda_nvcc_target_flags "") - CUDA_COMPUTE_TARGET_FLAGS(CUDA_ARCH_BIN CUDA_ARCH_PTX cuda_nvcc_target_flags) + CUDA_COMPUTE_TARGET_FLAGS(CUDA_ARCH_BIN CUDA_ARCH_PTX cuda_nvcc_target_flags) if(cuda_nvcc_target_flags) message(STATUS "CUDA NVCC target flags: ${cuda_nvcc_target_flags}") list(APPEND CUDA_NVCC_FLAGS ${cuda_nvcc_target_flags}) diff --git a/cmake/Modules/FindFZAPI.cmake b/cmake/Modules/FindFZAPI.cmake index 399cc67cffc..b4de99f468b 100644 --- a/cmake/Modules/FindFZAPI.cmake +++ b/cmake/Modules/FindFZAPI.cmake @@ -5,22 +5,22 @@ # FZAPI_FOUND - True if FZAPI was found. # FZAPI_INCLUDE_DIRS - Directories containing the FZAPI include files. # FZAPI_LIBRARIES - Libraries needed to use FZAPI. - + if(FZ_API_DIR) # Find include dirs find_path(FZAPI_INCLUDE_DIR fz_api.h PATHS "${FZ_API_DIR}" NO_DEFAULT_PATH DOC "Fotonic include directories") - + # Find libraries find_library(FZAPI_LIBS fotonic_fz_api HINTS "${FZ_API_DIR}/Release" NO_DEFAULT_PATH DOC "Fotonic libraries") else() - set(FZ_API_DIR "default value" CACHE FILEPATH "directory of Fotonic API") + set(FZ_API_DIR "default value" CACHE FILEPATH "directory of Fotonic API") endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(FZAPI DEFAULT_MSG FZAPI_LIBS FZAPI_INCLUDE_DIRS) - + diff --git a/cmake/Modules/FindGLEW.cmake b/cmake/Modules/FindGLEW.cmake index 2f245bbcaa1..062948272b3 100644 --- a/cmake/Modules/FindGLEW.cmake +++ b/cmake/Modules/FindGLEW.cmake @@ -1,8 +1,8 @@ -# Copyright (c) 2009 Boudewijn Rempt -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# +# Copyright (c) 2009 Boudewijn Rempt +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# # - try to find glew library and include files # GLEW_INCLUDE_DIR, where to find GL/glew.h, etc. # GLEW_LIBRARIES, the libraries to link against @@ -24,7 +24,7 @@ if(WIN32) else() - + find_path( GLEW_INCLUDE_DIR GL/glew.h $ENV{GLEW_ROOT}/include ) diff --git a/cmake/Modules/FindGTSAM.cmake b/cmake/Modules/FindGTSAM.cmake index bcae17f1d70..6f20137ba2e 100644 --- a/cmake/Modules/FindGTSAM.cmake +++ b/cmake/Modules/FindGTSAM.cmake @@ -39,7 +39,7 @@ else() string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type_suffix) # build suffix of this project get_filename_component(my_build_name "${CMAKE_BINARY_DIR}" NAME) - + set(gtsam_build_names "${my_build_name}/gtsam" "build-${build_type_suffix}/gtsam" "build/gtsam") endif() @@ -81,7 +81,7 @@ endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GTSAM DEFAULT_MSG GTSAM_LIBS GTSAM_INCLUDE_DIR) - + diff --git a/cmake/Modules/FindQVTK.cmake b/cmake/Modules/FindQVTK.cmake index 641f421e7ba..64599d55eef 100644 --- a/cmake/Modules/FindQVTK.cmake +++ b/cmake/Modules/FindQVTK.cmake @@ -5,7 +5,7 @@ # QVTK_FOUND - True if QVTK was found. # QVTK_INCLUDE_DIR - Directory containing the QVTK include files. # QVTK_LIBRARY - QVTK library. -# if QVTK_FOUND then QVTK_INCLUDE_DIR is appended to VTK_INCLUDE_DIRS and +# if QVTK_FOUND then QVTK_INCLUDE_DIR is appended to VTK_INCLUDE_DIRS and # QVTK_LIBRARY is appended to QVTK_LIBRARY_DIR if(${VTK_MAJOR_VERSION} VERSION_LESS "6.0") find_library(QVTK_LIBRARY QVTK HINTS ${VTK_DIR} ${VTK_DIR}/bin) diff --git a/cmake/Modules/Findlibusb-1.0.cmake b/cmake/Modules/Findlibusb-1.0.cmake index def2f2e5342..a46e369f950 100644 --- a/cmake/Modules/Findlibusb-1.0.cmake +++ b/cmake/Modules/Findlibusb-1.0.cmake @@ -11,7 +11,7 @@ # Copyright (c) 2006 Andreas Schneider # # (Changes for libusb) Copyright (c) 2008 Kyle Machulis -# +# # Point Cloud Library (PCL) - www.pointclouds.org # Copyright (c) 2012, Willow Garage, Inc. (use of FindPackageHandleStandardArgs) # @@ -52,7 +52,7 @@ if(LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS) else() find_path(LIBUSB_1_INCLUDE_DIR NAMES libusb-1.0/libusb.h - PATHS /usr/include /usr/local/include /opt/local/include /sw/include + PATHS /usr/include /usr/local/include /opt/local/include /sw/include PATH_SUFFIXES libusb-1.0) find_library(LIBUSB_1_LIBRARY diff --git a/cmake/Modules/NSIS.template.in b/cmake/Modules/NSIS.template.in index fd17d643b91..b94ad0c9d33 100644 --- a/cmake/Modules/NSIS.template.in +++ b/cmake/Modules/NSIS.template.in @@ -37,7 +37,7 @@ ;Set compression SetCompressor @CPACK_NSIS_COMPRESSOR@ -@CPACK_NSIS_DEFINES@ +@CPACK_NSIS_DEFINES@ !include Sections.nsh @@ -71,7 +71,7 @@ Var AR_RegFlags ; This macro reads component installed flag from the registry and ;changes checked state of the section on the components page. ;Input: section index constant name specified in Section command. - + ClearErrors ;Reading component status from registry ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}" "Installed" @@ -86,20 +86,20 @@ Var AR_RegFlags ; Note whether this component was installed before !insertmacro StoreVar ${SecName}_was_installed $AR_RegFlags IntOp $R0 $AR_RegFlags & $AR_RegFlags - + ;Writing modified flags SectionSetFlags ${${SecName}} $AR_SecFlags - + "default_${SecName}:" !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected !macroend - + !macro FinishSection SecName ; This macro reads section flag set by user and removes the section ;if it is not selected. ;Then it writes component installed flag to registry ;Input: section index constant name specified in Section command. - + SectionGetFlags ${${SecName}} $AR_SecFlags ;Reading section flags ;Checking lowest bit: IntOp $AR_SecFlags $AR_SecFlags & ${SF_SELECTED} @@ -110,20 +110,20 @@ Var AR_RegFlags WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}" \ "Installed" 0 Goto "exit_${SecName}" - + "leave_${SecName}:" ;Section is selected: WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}" \ "Installed" 1 - + "exit_${SecName}:" !macroend - + !macro RemoveSection SecName ; This macro is used to call section's Remove_... macro ;from the uninstaller. ;Input: section index constant name specified in Section command. - + !insertmacro "Remove_${${SecName}}" !macroend @@ -132,18 +132,18 @@ Var AR_RegFlags !insertmacro LoadVar ${SecName}_selected SectionGetFlags ${${SecName}} $R1 IntOp $R1 $R1 & ${SF_SELECTED} ;Turn off all other bits - + ; See if the status has changed: IntCmp $R0 $R1 "${SecName}_unchanged" !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected - + IntCmp $R1 ${SF_SELECTED} "${SecName}_was_selected" !insertmacro "Deselect_required_by_${SecName}" goto "${SecName}_unchanged" - + "${SecName}_was_selected:" !insertmacro "Select_${SecName}_depends" - + "${SecName}_unchanged:" !macroend ;--- End of Add/Remove macros --- @@ -153,7 +153,7 @@ Var AR_RegFlags !define MUI_HEADERIMAGE !define MUI_ABORTWARNING - + ;-------------------------------- ; path functions @@ -168,7 +168,7 @@ Var AR_RegFlags !include "WinMessages.NSH" !verbose 4 ;==================================================== -; get_NT_environment +; get_NT_environment ; Returns: the selected environment ; Output : head of the stack ;==================================================== @@ -198,22 +198,22 @@ FunctionEnd !define WriteEnvStr_RegKey 'HKCU "Environment"' !endif !endif - + ; AddToPath - Adds the given dir to the search path. ; Input - head of the stack ; Note - Win9x systems requires reboot - + Function AddToPath Exch $0 Push $1 Push $2 Push $3 - + # don't add if the path doesn't exist IfFileExists "$0\*.*" "" AddToPath_done - + ReadEnvStr $1 PATH - ; if the path is too long for a NSIS variable NSIS will return a 0 + ; if the path is too long for a NSIS variable NSIS will return a 0 ; length string. If we find that, then warn and skip any path ; modification as it will trash the existing path. StrLen $2 $1 @@ -243,7 +243,7 @@ Function AddToPath Call StrStr Pop $2 StrCmp $2 "" "" AddToPath_done - + Call IsNT Pop $1 StrCmp $1 1 AddToPath_NT @@ -258,7 +258,7 @@ Function AddToPath FileClose $1 SetRebootFlag true Goto AddToPath_done - + AddToPath_NT: StrCmp $ADD_TO_PATH_ALL_USERS "1" ReadAllKey ReadRegStr $1 ${NT_current_env} "PATH" @@ -279,7 +279,7 @@ Function AddToPath WriteRegExpandStr ${NT_all_env} "PATH" $0 DoSend: SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - + AddToPath_done: Pop $3 Pop $2 @@ -287,10 +287,10 @@ Function AddToPath Pop $0 FunctionEnd - + ; RemoveFromPath - Remove a given dir from the path ; Input: head of the stack - + Function un.RemoveFromPath Exch $0 Push $1 @@ -299,9 +299,9 @@ Function un.RemoveFromPath Push $4 Push $5 Push $6 - + IntFmt $6 "%c" 26 # DOS EOF - + Call un.IsNT Pop $1 StrCmp $1 1 unRemoveFromPath_NT @@ -313,7 +313,7 @@ Function un.RemoveFromPath GetFullPathName /SHORT $0 $0 StrCpy $0 "SET PATH=%PATH%;$0" Goto unRemoveFromPath_dosLoop - + unRemoveFromPath_dosLoop: FileRead $1 $3 StrCpy $5 $3 1 -1 # read last char @@ -328,7 +328,7 @@ Function un.RemoveFromPath unRemoveFromPath_dosLoopRemoveLine: SetRebootFlag true Goto unRemoveFromPath_dosLoop - + unRemoveFromPath_dosLoopEnd: FileClose $2 FileClose $1 @@ -337,7 +337,7 @@ Function un.RemoveFromPath CopyFiles /SILENT $4 "$1\autoexec.bat" Delete $4 Goto unRemoveFromPath_done - + unRemoveFromPath_NT: StrCmp $ADD_TO_PATH_ALL_USERS "1" unReadAllKey ReadRegStr $1 ${NT_current_env} "PATH" @@ -361,11 +361,11 @@ Function un.RemoveFromPath StrCpy $5 $1 -$4 # $5 is now the part before the path to remove StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove StrCpy $3 $5$6 - + StrCpy $5 $3 1 -1 # copy last char StrCmp $5 ";" 0 +2 # if last char == ; StrCpy $3 $3 -1 # remove last char - + StrCmp $ADD_TO_PATH_ALL_USERS "1" unWriteAllKey WriteRegExpandStr ${NT_current_env} "PATH" $3 Goto unDoSend @@ -373,7 +373,7 @@ Function un.RemoveFromPath WriteRegExpandStr ${NT_all_env} "PATH" $3 unDoSend: SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - + unRemoveFromPath_done: Pop $6 Pop $5 @@ -383,7 +383,7 @@ Function un.RemoveFromPath Pop $1 Pop $0 FunctionEnd - + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Uninstall sutff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -391,7 +391,7 @@ FunctionEnd ########################################### # Utility Functions # ########################################### - + ;==================================================== ; IsNT - Returns 1 if the current system is NT, 0 ; otherwise. @@ -405,7 +405,7 @@ FunctionEnd ; Call IsNT ; Pop $R0 ; ($R0 at this point is 1 or 0) - + !macro IsNT un Function ${un}IsNT Push $0 @@ -415,7 +415,7 @@ Function ${un}IsNT Pop $0 Push 0 Return - + IsNT_yes: ; NT!!! Pop $0 @@ -424,7 +424,7 @@ FunctionEnd !macroend !insertmacro IsNT "" !insertmacro IsNT "un." - + ; StrStr ; input, top of stack = string to search for ; top of stack-1 = string to search in @@ -437,7 +437,7 @@ FunctionEnd ; Call StrStr ; Pop $R0 ; ($R0 at this point is "ass string") - + !macro StrStr un Function ${un}StrStr Exch $R1 ; st=haystack,old$R1, $R1=needle @@ -481,7 +481,7 @@ Loop: StrCmp "$R2" "$\r" RTrim StrCmp "$R2" ";" RTrim GoTo Done -RTrim: +RTrim: StrCpy $R1 "$R1" -1 Goto Loop Done: @@ -516,7 +516,7 @@ Function DownloadFile try_again: NSISdl::download "$1/$0" "$INSTDIR\$0" - + Pop $1 StrCmp $1 "success" success StrCmp $1 "Cancelled" cancel @@ -549,10 +549,10 @@ FunctionEnd !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@" Page custom InstallOptionsPage !insertmacro MUI_PAGE_DIRECTORY - + ;Start Menu Folder Page Configuration - !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" - !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" + !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" + !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER @@ -638,7 +638,7 @@ Section "-Core installation" ;list of directories here in sync with the RMDir commands below. SetOutPath "$INSTDIR" @CPACK_NSIS_FULL_INSTALL@ - + ;Store installation folder WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR WriteRegStr SHCTX "Software\Kitware\CMake\Packages\@CPACK_PACKAGE_NAME@" "@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "$INSTDIR\@CPACK_PACKAGE_CONFIG_INSTALL_DIR@" @@ -649,7 +649,7 @@ Section "-Core installation" WriteRegExpandStr ${env_hklm} PCL_ROOT "$INSTDIR" ; make sure windows knows about the change SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=1000 - + ;Create uninstaller WriteUninstaller "$INSTDIR\Uninstall.exe" Push "DisplayName" @@ -667,7 +667,7 @@ Section "-Core installation" Push "NoRepair" Push "1" Call ConditionalAddToRegisty - + !ifdef CPACK_NSIS_ADD_REMOVE ;Create add/remove functionality Push "ModifyPath" @@ -678,7 +678,7 @@ Section "-Core installation" Push "1" Call ConditionalAddToRegisty !endif - + ; Optional registration Push "DisplayIcon" Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@" @@ -694,7 +694,7 @@ Section "-Core installation" Call ConditionalAddToRegisty !insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP "NSIS.InstallOptions.ini" "Field 5" "State" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - + ;Create shortcuts CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER" @CPACK_NSIS_CREATE_ICONS@ @@ -732,7 +732,7 @@ SectionEnd Section "-Add to path" Push $INSTDIR\bin StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 doNotAddToPath - StrCmp $DO_NOT_ADD_TO_PATH "1" doNotAddToPath 0 + StrCmp $DO_NOT_ADD_TO_PATH "1" doNotAddToPath 0 Call AddToPath doNotAddToPath: SectionEnd @@ -763,12 +763,12 @@ Function un.onInit SetShellVarContext all ;MessageBox MB_OK 'User "$0" is in the Power Users group' Goto done - + noLM: ;Get installation folder from registry if available done: - + FunctionEnd ;--- Add/Remove callback functions: --- @@ -777,25 +777,25 @@ FunctionEnd ;List all of your components in following manner here. @CPACK_NSIS_COMPONENT_SECTION_LIST@ !macroend - + Section -FinishComponents ;Removes unselected components and writes component status to registry !insertmacro SectionList "FinishSection" - -!ifdef CPACK_NSIS_ADD_REMOVE + +!ifdef CPACK_NSIS_ADD_REMOVE ; Get the name of the installer executable System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024) i r1' StrCpy $R3 $R0 - + ; Strip off the last 13 characters, to see if we have AddRemove.exe StrLen $R1 $R0 IntOp $R1 $R0 - 13 StrCpy $R2 $R0 13 $R1 StrCmp $R2 "AddRemove.exe" addremove_installed - + ; We're not running AddRemove.exe, so install it CopyFiles $R3 $INSTDIR\AddRemove.exe - + addremove_installed: !endif SectionEnd @@ -832,7 +832,7 @@ Section "Uninstall" @CPACK_NSIS_DELETE_FILES@ @CPACK_NSIS_DELETE_DIRECTORIES@ -!ifdef CPACK_NSIS_ADD_REMOVE +!ifdef CPACK_NSIS_ADD_REMOVE ;Remove the add/remove program Delete "$INSTDIR\AddRemove.exe" !endif @@ -854,23 +854,23 @@ Section "Uninstall" ; Removes all optional components !insertmacro SectionList "RemoveSection" - + !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP - + Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" @CPACK_NSIS_DELETE_ICONS@ @CPACK_NSIS_DELETE_ICONS_EXTRA@ - + ;Delete empty start menu parent directories StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" - + startMenuDeleteLoop: ClearErrors RMDir $MUI_TEMP GetFullPathName $MUI_TEMP "$MUI_TEMP\.." - + IfErrors startMenuDeleteLoopDone - + StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop startMenuDeleteLoopDone: @@ -879,17 +879,17 @@ Section "Uninstall" StrCpy $MUI_TEMP "$START_MENU" Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" @CPACK_NSIS_DELETE_ICONS_EXTRA@ - + ;Delete empty start menu parent directories StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" - + secondStartMenuDeleteLoop: ClearErrors RMDir $MUI_TEMP GetFullPathName $MUI_TEMP "$MUI_TEMP\.." - + IfErrors secondStartMenuDeleteLoopDone - + StrCmp "$MUI_TEMP" "$SMPROGRAMS" secondStartMenuDeleteLoopDone secondStartMenuDeleteLoop secondStartMenuDeleteLoopDone: @@ -916,14 +916,14 @@ Function .onInit ; Reads components status for registry !insertmacro SectionList "InitSection" - ; check to see if /D has been used to change - ; the install directory by comparing it to the + ; check to see if /D has been used to change + ; the install directory by comparing it to the ; install directory that is expected to be the ; default StrCpy $IS_DEFAULT_INSTALLDIR 0 StrCmp "$INSTDIR" "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2 StrCpy $IS_DEFAULT_INSTALLDIR 1 - + StrCpy $SV_ALLUSERS "JustMe" ; if default install dir then change the default ; if it is installed for JustMe @@ -946,7 +946,7 @@ Function .onInit ;MessageBox MB_OK 'User "$0" is in the Power Users group' StrCpy $SV_ALLUSERS "AllUsers" Goto done - + noLM: StrCpy $SV_ALLUSERS "AllUsers" ;Get installation folder from registry if available diff --git a/cmake/cpack_options.cmake.in b/cmake/cpack_options.cmake.in index b56721a93ae..7787a4e9028 100644 --- a/cmake/cpack_options.cmake.in +++ b/cmake/cpack_options.cmake.in @@ -15,7 +15,7 @@ if((WIN32 OR UNIX) AND (CPACK_GENERATOR STREQUAL "NSIS")) set(CPACK_NSIS_URL_INFO_ABOUT "http://www.pointclouds.org") set(CPACK_NSIS_MODIFY_PATH ON) set(CPACK_PACKAGE_EXECUTABLES @PCL_EXECUTABLES@) - set(CPACK_NSIS_MENU_LINKS + set(CPACK_NSIS_MENU_LINKS "share/doc/pcl-@PCL_VERSION_MAJOR@.@PCL_VERSION_MINOR@/tutorials/html/index.html" "Tutorials" "share/doc/pcl-@PCL_VERSION_MAJOR@.@PCL_VERSION_MINOR@/tutorials/html/sources" "Tutorials sources" "share/doc/pcl-@PCL_VERSION_MAJOR@.@PCL_VERSION_MINOR@/html/pcl-@PCL_VERSION_MAJOR@.@PCL_VERSION_MINOR@.chm" "Documentation" diff --git a/cmake/dep_graph.cmake b/cmake/dep_graph.cmake index 1f84dd0b1dd..3994543bcb0 100644 --- a/cmake/dep_graph.cmake +++ b/cmake/dep_graph.cmake @@ -9,7 +9,7 @@ function(MAKE_DEP_GRAPH) NOT _ss STREQUAL "tools" AND NOT _ss STREQUAL "test" AND NOT _ss STREQUAL "python" AND - NOT _ss STREQUAL "documentation") + NOT _ss STREQUAL "documentation") PCL_GET_SUBSYS_STATUS(_status ${_ss}) if(_status) file(APPEND ${_dot_file} diff --git a/cmake/pcl_all_in_one_installer.cmake b/cmake/pcl_all_in_one_installer.cmake index 692739e9037..7397d0d6b6b 100644 --- a/cmake/pcl_all_in_one_installer.cmake +++ b/cmake/pcl_all_in_one_installer.cmake @@ -40,12 +40,12 @@ if(BUILD_all_in_one_installer) set(OPENNI_MD5 996d48f447b41a5501b7d22af27ab251) set(OPENNI_SENSOR_PACKAGE "Sensor-Win-OpenSource32-5.1.0.msi") set(OPENNI_SENSOR_URL "http://sourceforge.net/projects/pointclouds/files/dependencies/${OPENNI_SENSOR_PACKAGE}") - set(OPENNI_SENSOR_MD5 55da1f7541d7c9c98772bddf801c7e1c) + set(OPENNI_SENSOR_MD5 55da1f7541d7c9c98772bddf801c7e1c) endif() set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " IntCmp $OpenNI_selected 0 noinstall_openni_packages\n") - file(DOWNLOAD ${OPENNI_URL} "${CMAKE_CURRENT_BINARY_DIR}/${OPENNI_PACKAGE}" + file(DOWNLOAD ${OPENNI_URL} "${CMAKE_CURRENT_BINARY_DIR}/${OPENNI_PACKAGE}" STATUS _openni_download_status LOG _openni_download_log EXPECTED_MD5 ${OPENNI_MD5} ) @@ -53,18 +53,18 @@ if(BUILD_all_in_one_installer) list(GET _openni_download_status 1 _error_message) if(_error_code EQUAL 0) install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/${OPENNI_PACKAGE}" + FILES "${CMAKE_CURRENT_BINARY_DIR}/${OPENNI_PACKAGE}" DESTINATION 3rdParty/OpenNI COMPONENT OpenNI ) list(APPEND PCL_3RDPARTY_COMPONENTS OpenNI) - set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}\n ExecWait 'msiexec /i \\\"$INSTDIR\\\\3rdParty\\\\OpenNI\\\\${OPENNI_PACKAGE}\\\" '") else() message("WARNING : Could not download ${OPENNI_URL}, error code : ${_error_code}, error message : ${_error_message}") endif() - file(DOWNLOAD ${OPENNI_SENSOR_URL} "${CMAKE_CURRENT_BINARY_DIR}/${OPENNI_SENSOR_PACKAGE}" + file(DOWNLOAD ${OPENNI_SENSOR_URL} "${CMAKE_CURRENT_BINARY_DIR}/${OPENNI_SENSOR_PACKAGE}" STATUS _openni_download_status LOG _openni_download_log EXPECTED_MD5 ${OPENNI_SENSOR_MD5} ) @@ -77,7 +77,7 @@ if(BUILD_all_in_one_installer) COMPONENT OpenNI ) list(APPEND PCL_3RDPARTY_COMPONENTS OpenNI) - set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}\n ExecWait 'msiexec /i \\\"$INSTDIR\\\\3rdParty\\\\OpenNI\\\\${OPENNI_SENSOR_PACKAGE}\\\" '") else() message("WARNING : Could not download ${OPENNI_SENSOR_URL}, error code : ${_error_code}, error message : ${_error_message}") @@ -101,7 +101,7 @@ if(BUILD_all_in_one_installer) set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " IntCmp $OpenNI2_selected 0 noinstall_openni2_packages\n") - file(DOWNLOAD ${OPENNI2_URL} "${CMAKE_CURRENT_BINARY_DIR}/${OPENNI2_ZIP}" + file(DOWNLOAD ${OPENNI2_URL} "${CMAKE_CURRENT_BINARY_DIR}/${OPENNI2_ZIP}" STATUS _openni2_download_status LOG _openni2_download_log EXPECTED_MD5 ${OPENNI2_MD5} ) @@ -116,12 +116,12 @@ if(BUILD_all_in_one_installer) ) if(_error_code EQUAL 0) install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/${OPENNI2_PACKAGE}" + FILES "${CMAKE_CURRENT_BINARY_DIR}/${OPENNI2_PACKAGE}" DESTINATION 3rdParty/OpenNI2 COMPONENT OpenNI2 ) list(APPEND PCL_3RDPARTY_COMPONENTS OpenNI2) - set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}\n ExecWait 'msiexec /i \\\"$INSTDIR\\\\3rdParty\\\\OpenNI2\\\\${OPENNI2_PACKAGE}\\\" '") else() message("WARNING : Could not unzip ${OPENNI2_ZIP}, error code : ${_error_code}, error message : ${_error_message}") diff --git a/cmake/pcl_cpack.cmake b/cmake/pcl_cpack.cmake index 9ef0e8de222..764e668a505 100644 --- a/cmake/pcl_cpack.cmake +++ b/cmake/pcl_cpack.cmake @@ -89,13 +89,13 @@ macro(PCL_MAKE_CPACK_INPUT) set(CPACK_COMPONENTS_ALL "${CPACK_COMPONENTS_ALL} doc") set(PCL_CPACK_COMPONENTS "${PCL_CPACK_COMPONENTS}\nset(CPACK_COMPONENT_DOC_GROUP \"PCL\")\n") set(PCL_CPACK_COMPONENTS "${PCL_CPACK_COMPONENTS}\nset(CPACK_COMPONENT_DOC_DISPLAY_NAME \"Documentation\")\n") - set(PCL_CPACK_COMPONENTS "${PCL_CPACK_COMPONENTS}\nset(CPACK_COMPONENT_DOC_DESCRIPTION \"API documentation and tutorials\")\n") + set(PCL_CPACK_COMPONENTS "${PCL_CPACK_COMPONENTS}\nset(CPACK_COMPONENT_DOC_DESCRIPTION \"API documentation and tutorials\")\n") endif() # add PCLConfig set(CPACK_COMPONENTS_ALL "${CPACK_COMPONENTS_ALL} pclconfig") set(PCL_CPACK_COMPONENTS "${PCL_CPACK_COMPONENTS}\nset(CPACK_COMPONENT_PCLCONFIG_GROUP \"PCL\")\n") set(PCL_CPACK_COMPONENTS "${PCL_CPACK_COMPONENTS}\nset(CPACK_COMPONENT_PCLCONFIG_DISPLAY_NAME \"PCLConfig\")\n") - set(PCL_CPACK_COMPONENTS "${PCL_CPACK_COMPONENTS}\nset(CPACK_COMPONENT_PCLCONFIG_DESCRIPTION \"Helper cmake configuration scripts used by find_package(PCL)\")\n") + set(PCL_CPACK_COMPONENTS "${PCL_CPACK_COMPONENTS}\nset(CPACK_COMPONENT_PCLCONFIG_DESCRIPTION \"Helper cmake configuration scripts used by find_package(PCL)\")\n") # add 3rdParty libs if(BUILD_all_in_one_installer) @@ -105,7 +105,7 @@ macro(PCL_MAKE_CPACK_INPUT) string(TOUPPER ${dep} DEP) set(PCL_CPACK_COMPONENTS "${PCL_CPACK_COMPONENTS}\nset(CPACK_COMPONENT_${DEP}_GROUP \"ThirdParty\")") set(CPACK_COMPONENTS_ALL "${CPACK_COMPONENTS_ALL} ${dep}") - endforeach(dep) + endforeach(dep) endif() set(PCL_CPACK_COMPONENTS "${PCL_CPACK_COMPONENTS}\nset(CPACK_COMPONENTS_ALL${CPACK_COMPONENTS_ALL})\n") @@ -142,7 +142,7 @@ macro(PCL_CPACK_ADD_COMP_INFO _var _ss) endforeach(_dep) set(${_var} "${${_var}}set(CPACK_COMPONENT_PCL_${_comp_name}_DEPENDS ${_deps_str})\n") - set(${_var} + set(${_var} "${${_var}}set(CPACK_COMPONENT_PCL_${_comp_name}_GROUP \"PCL\")\n") endmacro() diff --git a/cmake/pcl_find_boost.cmake b/cmake/pcl_find_boost.cmake index 9ae720a01c6..42c5de49ba3 100644 --- a/cmake/pcl_find_boost.cmake +++ b/cmake/pcl_find_boost.cmake @@ -46,7 +46,7 @@ endif() if(Boost_FOUND) set(BOOST_FOUND TRUE) - # Obtain diagnostic information about Boost's automatic linking outputted + # Obtain diagnostic information about Boost's automatic linking outputted # during compilation time. add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINITIONS}) include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) diff --git a/cmake/pcl_find_cuda.cmake b/cmake/pcl_find_cuda.cmake index b5ffa883144..f481e06e56a 100644 --- a/cmake/pcl_find_cuda.cmake +++ b/cmake/pcl_find_cuda.cmake @@ -47,7 +47,7 @@ if(CUDA_FOUND) elseif(NOT ${CUDA_VERSION_STRING} VERSION_LESS "9.1") set(__cuda_arch_bin "3.0 3.5 5.0 5.2 5.3 6.0 6.1 7.0 7.2") elseif(NOT ${CUDA_VERSION_STRING} VERSION_LESS "9.0") - set(__cuda_arch_bin "3.0 3.5 5.0 5.2 5.3 6.0 6.1 7.0") + set(__cuda_arch_bin "3.0 3.5 5.0 5.2 5.3 6.0 6.1 7.0") elseif(NOT ${CUDA_VERSION_STRING} VERSION_LESS "8.0") set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5 5.0 5.2 5.3 6.0 6.1") elseif(NOT ${CUDA_VERSION_STRING} VERSION_LESS "6.5") diff --git a/cmake/pcl_pclconfig.cmake b/cmake/pcl_pclconfig.cmake index 62c87c21754..e88e8bdb854 100644 --- a/cmake/pcl_pclconfig.cmake +++ b/cmake/pcl_pclconfig.cmake @@ -38,7 +38,7 @@ foreach(_ss ${PCL_SUBSYSTEMS_MODULES}) set(PCLCONFIG_EXTERNAL_DEPENDENCIES "${PCLCONFIG_EXTERNAL_DEPENDENCIES}${_ext_dep} ") endforeach(_ext_dep) set(PCLCONFIG_EXTERNAL_DEPENDENCIES "${PCLCONFIG_EXTERNAL_DEPENDENCIES})\n") - endif() + endif() GET_IN_MAP(_opt_deps PCL_SUBSYS_OPT_DEPS ${_ss}) if(_opt_deps) set(PCLCONFIG_OPTIONAL_DEPENDENCIES "${PCLCONFIG_OPTIONAL_DEPENDENCIES}set(pcl_${_ss}_opt_dep ") diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake index ad8f2bf88a7..ef43c3fc47d 100644 --- a/cmake/pcl_targets.cmake +++ b/cmake/pcl_targets.cmake @@ -201,7 +201,7 @@ macro(PCL_ADD_LIBRARY _name _component) if(MINGW) target_link_libraries(${_name} gomp) endif() - + if(MSVC) target_link_libraries(${_name} delayimp.lib) # because delay load is enabled for openmp.dll endif() @@ -235,7 +235,7 @@ macro(PCL_CUDA_ADD_LIBRARY _name _component) else() cuda_add_library(${_name} ${PCL_LIB_TYPE} ${ARGN}) endif() - + # must link explicitly against boost. target_link_libraries(${_name} ${Boost_LIBRARIES}) @@ -286,7 +286,7 @@ endmacro() # Add an executable target as a bundle when available and required # _name The executable name. # _component The part of PCL that this library belongs to. -# _bundle +# _bundle # ARGN the source files for the library. macro(PCL_ADD_EXECUTABLE_OPT_BUNDLE _name _component) if(APPLE AND VTK_USE_COCOA) @@ -317,7 +317,7 @@ if(APPLE AND VTK_USE_COCOA) # add_custom_command(TARGET ${_name} # POST_BUILD # COMMAND ${CMAKE_COMMAND} -E create_symlink ${PCL_OUTPUT_BIN_DIR}/${_name}.app/Contents/MacOS/${_name} ${PCL_OUTPUT_BIN_DIR}/${_name} -# # WORKING_DIRECTORY +# # WORKING_DIRECTORY # COMMENT "Creating an alias for ${_name}.app to ${_name}") install(TARGETS ${_name} BUNDLE DESTINATION ${BIN_INSTALL_DIR} COMPONENT pcl_${_component}) else() @@ -345,7 +345,7 @@ macro(PCL_CUDA_ADD_EXECUTABLE _name _component) if(USE_PROJECT_FOLDERS) set_target_properties(${_name} PROPERTIES FOLDER "Tools and demos") endif() - + set(PCL_EXECUTABLES ${PCL_EXECUTABLES} ${_name}) install(TARGETS ${_name} RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT pcl_${_component}) @@ -483,8 +483,8 @@ macro(PCL_MAKE_PKGCONFIG _name _component _desc _pcl_deps _ext_deps _int_deps _c endmacro() ############################################################################### -# Make a pkg-config file for a header-only library. -# Essentially a duplicate of PCL_MAKE_PKGCONFIG, but +# Make a pkg-config file for a header-only library. +# Essentially a duplicate of PCL_MAKE_PKGCONFIG, but # ensures that no -L or l flags will be created # Do not include general PCL stuff in the # arguments; they will be added automatically. @@ -626,7 +626,7 @@ endmacro() # _dependee Dependent subsystem. # _status AUTO_OFF to disable AUTO_ON to enable # ARGN[0] Reason for not building. -macro(PCL_SET_SUBSYS_HYPERSTATUS _name _dependee _status) +macro(PCL_SET_SUBSYS_HYPERSTATUS _name _dependee _status) SET_IN_GLOBAL_MAP(PCL_SUBSYS_HYPERSTATUS ${_name}_${_dependee} ${_status}) if(${ARGC} EQUAL 4) SET_IN_GLOBAL_MAP(PCL_SUBSYS_REASONS ${_dependee} ${ARGV3}) @@ -662,7 +662,7 @@ endmacro() ############################################################################### # Set the include directory name of a subsystem. # _name Subsystem name. -# _includedir Name of subdirectory for includes +# _includedir Name of subdirectory for includes # ARGN[0] Reason for not building. macro(PCL_SET_SUBSYS_INCLUDE_DIR _name _includedir) SET_IN_GLOBAL_MAP(PCL_SUBSYS_INCLUDE ${_name} ${_includedir}) @@ -732,8 +732,8 @@ endmacro() ############################################################################## # Collect subdirectories from dirname that contains filename and store them in # varname. -# WARNING If extra arguments are given then they are considered as exception -# list and varname will contain subdirectories of dirname that contains +# WARNING If extra arguments are given then they are considered as exception +# list and varname will contain subdirectories of dirname that contains # fielename but doesn't belong to exception list. # dirname IN parent directory # filename IN file name to look for in each subdirectory of parent directory @@ -754,7 +754,7 @@ macro(collect_subproject_directory_names dirname filename names dirs) foreach(file ${globbed}) get_filename_component(dir ${file} PATH) set(${dirs} ${${dirs}} ${dir}) - endforeach(file) + endforeach(file) endif() foreach(subdir ${${dirs}}) file(STRINGS ${dirname}/${subdir}/CMakeLists.txt name REGEX "[setSET ]+\\(.*SUBSYS_NAME .*\\)$") @@ -827,12 +827,12 @@ macro (PCL_ADD_DOC _subsys) endif() if(NOT "${dependencies}" STREQUAL "") set(STRIPPED_HEADERS "${PCL_SOURCE_DIR}/${dependencies}/include") - string(REPLACE ";" "/include \\\n\t\t\t\t\t\t\t\t\t\t\t\t ${PCL_SOURCE_DIR}/" + string(REPLACE ";" "/include \\\n\t\t\t\t\t\t\t\t\t\t\t\t ${PCL_SOURCE_DIR}/" STRIPPED_HEADERS "${STRIPPED_HEADERS}") endif() set(DOC_SOURCE_DIR "\"${CMAKE_CURRENT_SOURCE_DIR}\"\\") foreach(dep ${dependencies}) - set(DOC_SOURCE_DIR + set(DOC_SOURCE_DIR "${DOC_SOURCE_DIR}\n\t\t\t\t\t\t\t\t\t\t\t\t \"${PCL_SOURCE_DIR}/${dep}\"\\") endforeach(dep) file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html") diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake index bd9d207df3e..bb138451193 100644 --- a/cmake/pcl_utils.cmake +++ b/cmake/pcl_utils.cmake @@ -198,8 +198,8 @@ endmacro() # See accompanying file LICENSE_1_0.txt or copy at # # http://www.boost.org/LICENSE_1_0.txt # ########################################################################## -# Perform a reverse topological sort on the given LIST. -# +# Perform a reverse topological sort on the given LIST. +# # topological_sort(my_list "MY_" "_EDGES") # # LIST is the name of a variable containing a list of elements to be @@ -221,7 +221,7 @@ endmacro() # using the following variables: # # MY_A_EDGES b -# MY_B_EDGES +# MY_B_EDGES # MY_C_EDGES a b # # With the involcation of topological_sort shown above and these @@ -243,7 +243,7 @@ macro(topological_sort LIST PREFIX SUFFIX) # search from where. if(NOT FOUND_${UPPER_VERTEX}) # Push this vertex onto the stack with all of its outgoing edges - string(REPLACE ";" " " NEW_ELEMENT + string(REPLACE ";" " " NEW_ELEMENT "${VERTEX};${${PREFIX}${UPPER_VERTEX}${SUFFIX}}") list(APPEND STACK ${NEW_ELEMENT}) @@ -281,14 +281,14 @@ macro(topological_sort LIST PREFIX SUFFIX) # Push the remaining edges for the current vertex onto the # stack - string(REPLACE ";" " " NEW_ELEMENT + string(REPLACE ";" " " NEW_ELEMENT "${SOURCE};${OUT_EDGES}") list(APPEND STACK ${NEW_ELEMENT}) # Setup the new source and outgoing edges set(SOURCE ${TARGET}) string(TOUPPER ${SOURCE} UPPER_SOURCE) - set(OUT_EDGES + set(OUT_EDGES ${${PREFIX}${UPPER_SOURCE}${SUFFIX}}) endif() @@ -327,7 +327,7 @@ macro(swap_elements _list _pos1 _pos2) set(pos2 ${${_pos1}}) else() set(pos1 ${${_pos1}}) - set(pos2 ${${_pos2}}) + set(pos2 ${${_pos2}}) endif() list(GET ${_list} ${pos1} element1) @@ -377,7 +377,7 @@ endmacro() ### # Sorts list B the same way list A was sorted by fetching the indices -# _list [IN] original list A +# _list [IN] original list A # _sorted_list [IN] list A after sorting # _to_sort_relative [IN/OUT] list B ## diff --git a/cmake/pkgconfig-headeronly.cmake.in b/cmake/pkgconfig-headeronly.cmake.in index 950fa785c25..9cf9b9d81e9 100644 --- a/cmake/pkgconfig-headeronly.cmake.in +++ b/cmake/pkgconfig-headeronly.cmake.in @@ -8,5 +8,5 @@ Name: @PKG_NAME@ Description: @PKG_DESC@ Version: @PCL_VERSION@ Requires: @PKG_EXTERNAL_DEPS@ -Libs: +Libs: Cflags: -I${includedir} @PKG_CFLAGS@ diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index d7503a506a4..87e56b0b193 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -15,7 +15,7 @@ if(build) include/pcl/range_image/range_image_planar.h include/pcl/range_image/range_image_spherical.h ) - + set(range_image_incs_impl include/pcl/range_image/impl/range_image.hpp include/pcl/range_image/impl/range_image_planar.hpp @@ -28,7 +28,7 @@ if(build) src/range_image_planar.cpp ) - set(srcs + set(srcs src/point_types.cpp src/pcl_base.cpp src/io.cpp @@ -46,7 +46,7 @@ if(build) ${range_image_srcs} ) - set(incs + set(incs include/pcl/correspondence.h include/pcl/exceptions.h include/pcl/pcl_base.h @@ -74,7 +74,7 @@ if(build) include/pcl/conversions.h ) - set(common_incs + set(common_incs include/pcl/common/boost.h include/pcl/common/angles.h include/pcl/common/bivariate_polynomial.h @@ -139,24 +139,24 @@ if(build) include/pcl/common/impl/accumulators.hpp ) - set(impl_incs + set(impl_incs include/pcl/impl/pcl_base.hpp include/pcl/impl/instantiate.hpp include/pcl/impl/point_types.hpp include/pcl/impl/cloud_iterator.hpp ) - set(tools_incs + set(tools_incs include/pcl/console/parse.h include/pcl/console/print.h include/pcl/console/time.h ) - + set(kissfft_incs include/pcl/common/fft/_kiss_fft_guts.h include/pcl/common/fft/kiss_fft.h include/pcl/common/fft/kiss_fftr.h) - + set(kissfft_srcs src/fft/kiss_fft.c src/fft/kiss_fftr.c) diff --git a/cuda/CMakeLists.txt b/cuda/CMakeLists.txt index a8533a475cb..10d8b3abdc3 100644 --- a/cuda/CMakeLists.txt +++ b/cuda/CMakeLists.txt @@ -21,6 +21,6 @@ if(BUILD_CUDA AND CUDA_FOUND) sort_relative(PCL_CUDA_MODULES_NAMES_UNSORTED PCL_CUDA_MODULES_NAMES PCL_CUDA_MODULES_DIRS) foreach(subdir ${PCL_CUDA_MODULES_DIRS}) add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/${subdir}") - endforeach(subdir) + endforeach(subdir) endif() diff --git a/cuda/apps/CMakeLists.txt b/cuda/apps/CMakeLists.txt index 655e81049a8..a0957f05af5 100644 --- a/cuda/apps/CMakeLists.txt +++ b/cuda/apps/CMakeLists.txt @@ -3,7 +3,7 @@ set(SUBSYS_DESC "Point cloud library CUDA apps") set(SUBSYS_DEPS cuda_common cuda_io cuda_features cuda_segmentation cuda_sample_consensus common io visualization geometry) # ---[ Point Cloud Library - pcl/cuda/apps -# Find VTK +# Find VTK if(NOT VTK_FOUND) set(DEFAULT FALSE) set(REASON "VTK was not found.") diff --git a/cuda/common/CMakeLists.txt b/cuda/common/CMakeLists.txt index 69fc3750592..b5775afe577 100644 --- a/cuda/common/CMakeLists.txt +++ b/cuda/common/CMakeLists.txt @@ -10,7 +10,7 @@ PCL_SUBSYS_DEPEND(build ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS}) PCL_SET_SUBSYS_INCLUDE_DIR(${SUBSYS_NAME} ${SUBSYS_PATH}) ## ---[ Point Cloud Library - pcl/cuda/common -set(incs +set(incs include/pcl/cuda/cutil.h include/pcl/cuda/cutil_math.h include/pcl/cuda/point_cloud.h @@ -23,7 +23,7 @@ set(incs include/pcl/cuda/cutil_inline_drvapi.h include/pcl/cuda/cutil_inline_runtime.h ) -set(common_incs +set(common_incs include/pcl/cuda/common/eigen.h include/pcl/cuda/common/point_type_rgb.h ) diff --git a/doc/doxygen/CMakeLists.txt b/doc/doxygen/CMakeLists.txt index 17c6e27253f..854dc7ddc26 100644 --- a/doc/doxygen/CMakeLists.txt +++ b/doc/doxygen/CMakeLists.txt @@ -49,7 +49,7 @@ if(DOXYGEN_FOUND) FILES_MATCHING PATTERN *.chm ) else() - install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html" + install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html" DESTINATION "${DOC_INSTALL_DIR}" COMPONENT doc PATTERN "*.md5" EXCLUDE diff --git a/doc/doxygen/doxyfile.in b/doc/doxygen/doxyfile.in index b3069936038..49df0a975a3 100644 --- a/doc/doxygen/doxyfile.in +++ b/doc/doxygen/doxyfile.in @@ -25,7 +25,7 @@ ABBREVIATE_BRIEF = "The $name class" \ ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = YES -STRIP_FROM_PATH = +STRIP_FROM_PATH = STRIP_FROM_INC_PATH = @STRIPPED_HEADERS@ SHORT_NAMES = @SHORT_NAMES@ JAVADOC_AUTOBRIEF = YES @@ -34,13 +34,13 @@ MULTILINE_CPP_IS_BRIEF = NO INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 2 -ALIASES = +ALIASES = TCL_SUBST = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO -EXTENSION_MAPPING = +EXTENSION_MAPPING = MARKDOWN_SUPPORT = YES BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO @@ -83,12 +83,12 @@ GENERATE_TODOLIST = NO GENERATE_TESTLIST = NO GENERATE_BUGLIST = NO GENERATE_DEPRECATEDLIST= NO -ENABLED_SECTIONS = +ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES SHOW_FILES = NO SHOW_NAMESPACES = YES -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = LAYOUT_FILE = "@PCL_SOURCE_DIR@/doc/doxygen/doxygen_layout.xml" CITE_BIB_FILES = @@ -101,7 +101,7 @@ WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO WARN_FORMAT = "$file:$line: $text " -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files @@ -127,14 +127,14 @@ EXCLUDE = "@PCL_SOURCE_DIR@/cmake" \ "@PCL_SOURCE_DIR@/simulation" \ "@PCL_SOURCE_DIR@/test/gtest-1.6.0" EXCLUDE_SYMLINKS = YES -EXCLUDE_PATTERNS = -EXCLUDE_SYMBOLS = -EXAMPLE_PATH = +EXCLUDE_PATTERNS = +EXCLUDE_SYMBOLS = +EXAMPLE_PATH = EXAMPLE_PATTERNS = * EXAMPLE_RECURSIVE = NO IMAGE_PATH = "@PCL_SOURCE_DIR@/doc/doxygen" -INPUT_FILTER = -FILTER_PATTERNS = +INPUT_FILTER = +FILTER_PATTERNS = FILTER_SOURCE_FILES = NO FILTER_SOURCE_PATTERNS = @@ -155,7 +155,7 @@ VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = YES COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output @@ -163,9 +163,9 @@ IGNORE_PREFIX = GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html -HTML_HEADER = +HTML_HEADER = HTML_FOOTER = @PCL_SOURCE_DIR@/doc/doxygen/footer.html -HTML_STYLESHEET = +HTML_STYLESHEET = HTML_EXTRA_FILES = HTML_COLORSTYLE_HUE = 87 HTML_COLORSTYLE_SAT = 46 @@ -181,17 +181,17 @@ GENERATE_HTMLHELP = @DOCUMENTATION_HTML_HELP@ CHM_FILE = "pcl-@PCL_VERSION_MAJOR@.@PCL_VERSION_MINOR@.chm" HHC_LOCATION = "@HTML_HELP_COMPILER@" GENERATE_CHI = NO -CHM_INDEX_ENCODING = +CHM_INDEX_ENCODING = BINARY_TOC = NO TOC_EXPAND = NO GENERATE_QHP = NO -QCH_FILE = +QCH_FILE = QHP_NAMESPACE = pointclouds.org.Project QHP_VIRTUAL_FOLDER = doc -QHP_CUST_FILTER_NAME = -QHP_CUST_FILTER_ATTRS = -QHP_SECT_FILTER_ATTRS = -QHG_LOCATION = +QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = +QHG_LOCATION = GENERATE_ECLIPSEHELP = NO ECLIPSE_DOC_ID = pointclouds.org.Project DISABLE_INDEX = NO @@ -217,7 +217,7 @@ MAKEINDEX_CMD_NAME = makeindex COMPACT_LATEX = NO PAPER_TYPE = a4wide EXTRA_PACKAGES = amsmath amssymb -LATEX_HEADER = +LATEX_HEADER = LATEX_FOOTER = PDF_HYPERLINKS = YES USE_PDFLATEX = YES @@ -233,8 +233,8 @@ GENERATE_RTF = NO RTF_OUTPUT = rtf COMPACT_RTF = NO RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output @@ -262,7 +262,7 @@ GENERATE_AUTOGEN_DEF = NO GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the preprocessor @@ -271,7 +271,7 @@ ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = YES -INCLUDE_PATH = +INCLUDE_PATH = INCLUDE_FILE_PATTERNS = *.h #PREDEFINED = protected=private \ PREDEFINED = = "HAVE_QHULL=1" \ @@ -281,13 +281,13 @@ PREDEFINED = = "HAVE_QHULL=1" \ "HAVE_DSSDK=1" \ "HAVE_RSSDK=1" \ "PCL_DEPRECATED(x)=" -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = +TAGFILES = #TAGFILES = qtools_docs/qtools.tag=../../qtools_docs/html GENERATE_TAGFILE = pcl.tag ALLEXTERNALS = NO @@ -298,13 +298,13 @@ PERL_PATH = /usr/bin/perl # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES -MSCGEN_PATH = +MSCGEN_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = @HAVE_DOT@ DOT_NUM_THREADS = 0 DOT_FONTNAME = Helvetica DOT_FONTSIZE = 10 -DOT_FONTPATH = +DOT_FONTPATH = CLASS_GRAPH = YES COLLABORATION_GRAPH = YES GROUP_GRAPHS = YES @@ -319,8 +319,8 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png INTERACTIVE_SVG = YES -DOT_PATH = -DOTFILE_DIRS = +DOT_PATH = +DOTFILE_DIRS = MSCFILE_DIRS = DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 0 diff --git a/doc/tutorials/content/sources/CMakeLists.txt b/doc/tutorials/content/sources/CMakeLists.txt index f93e2f28546..50963469214 100644 --- a/doc/tutorials/content/sources/CMakeLists.txt +++ b/doc/tutorials/content/sources/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR) project("PCL_Tutorials") -foreach(subdir +foreach(subdir cloud_viewer cluster_extraction concatenate_clouds @@ -30,7 +30,7 @@ foreach(subdir openni_narf_keypoint_extraction openni_range_image_visualization passthrough - pcd_read + pcd_read pcd_write pcl_visualizer planar_segmentation diff --git a/doc/tutorials/content/sources/global_hypothesis_verification/CMakeLists.txt b/doc/tutorials/content/sources/global_hypothesis_verification/CMakeLists.txt index 3dbcceb68a5..10d5b006ea7 100644 --- a/doc/tutorials/content/sources/global_hypothesis_verification/CMakeLists.txt +++ b/doc/tutorials/content/sources/global_hypothesis_verification/CMakeLists.txt @@ -11,4 +11,4 @@ add_definitions(${PCL_DEFINITIONS}) add_executable (global_hypothesis_verification global_hypothesis_verification.cpp) target_link_libraries (global_hypothesis_verification ${PCL_LIBRARIES}) - + diff --git a/doc/tutorials/content/sources/openni_narf_keypoint_extraction/CMakeLists.txt b/doc/tutorials/content/sources/openni_narf_keypoint_extraction/CMakeLists.txt index 45d08852cee..c513801657b 100644 --- a/doc/tutorials/content/sources/openni_narf_keypoint_extraction/CMakeLists.txt +++ b/doc/tutorials/content/sources/openni_narf_keypoint_extraction/CMakeLists.txt @@ -7,7 +7,7 @@ find_package(PCL 1.3 REQUIRED) include_directories(${PCL_INCLUDE_DIRS}) link_directories(${PCL_LIBRARY_DIRS}) add_definitions(${PCL_DEFINITIONS}) - + add_executable (openni_narf_keypoint_extraction openni_narf_keypoint_extraction.cpp) target_link_libraries (openni_narf_keypoint_extraction ${PCL_LIBRARIES}) diff --git a/doc/tutorials/content/sources/openni_range_image_visualization/CMakeLists.txt b/doc/tutorials/content/sources/openni_range_image_visualization/CMakeLists.txt index 20457ce1c07..ee9d2936e3e 100644 --- a/doc/tutorials/content/sources/openni_range_image_visualization/CMakeLists.txt +++ b/doc/tutorials/content/sources/openni_range_image_visualization/CMakeLists.txt @@ -7,7 +7,7 @@ find_package(PCL 1.3 REQUIRED) include_directories(${PCL_INCLUDE_DIRS}) link_directories(${PCL_LIBRARY_DIRS}) add_definitions(${PCL_DEFINITIONS}) - + add_executable (openni_range_image_visualization openni_range_image_visualization.cpp) target_link_libraries (openni_range_image_visualization ${PCL_LIBRARIES}) diff --git a/doc/tutorials/content/sources/supervoxel_clustering/CMakeLists.txt b/doc/tutorials/content/sources/supervoxel_clustering/CMakeLists.txt index 6236a2ddeb2..ec50f3ffcc3 100644 --- a/doc/tutorials/content/sources/supervoxel_clustering/CMakeLists.txt +++ b/doc/tutorials/content/sources/supervoxel_clustering/CMakeLists.txt @@ -9,4 +9,4 @@ link_directories(${PCL_LIBRARY_DIRS}) add_definitions(${PCL_DEFINITIONS}) add_executable (supervoxel_clustering supervoxel_clustering.cpp) -target_link_libraries (supervoxel_clustering ${PCL_LIBRARIES}) +target_link_libraries (supervoxel_clustering ${PCL_LIBRARIES}) diff --git a/doc/tutorials/content/sources/vfh_recognition/CMakeLists.txt b/doc/tutorials/content/sources/vfh_recognition/CMakeLists.txt index d2fec0af457..06c7c1cfd60 100644 --- a/doc/tutorials/content/sources/vfh_recognition/CMakeLists.txt +++ b/doc/tutorials/content/sources/vfh_recognition/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR) -# we need FindFLANN.cmake +# we need FindFLANN.cmake list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) project(vfh_cluster_classifier) @@ -23,7 +23,7 @@ if(HDF5_FOUND) ${FLANN_LIBRARIES} ${HDF5_hdf5_LIBRARY}) add_executable(nearest_neighbors nearest_neighbors.cpp) - target_link_libraries(nearest_neighbors ${PCL_LIBRARIES} - ${Boost_LIBRARIES} ${FLANN_LIBRARIES} ${HDF5_hdf5_LIBRARY} + target_link_libraries(nearest_neighbors ${PCL_LIBRARIES} + ${Boost_LIBRARIES} ${FLANN_LIBRARIES} ${HDF5_hdf5_LIBRARY} ) endif() diff --git a/doc/tutorials/content/sources/vfh_recognition/FindFLANN.cmake b/doc/tutorials/content/sources/vfh_recognition/FindFLANN.cmake index 588353281ff..759833d5a6f 100644 --- a/doc/tutorials/content/sources/vfh_recognition/FindFLANN.cmake +++ b/doc/tutorials/content/sources/vfh_recognition/FindFLANN.cmake @@ -28,19 +28,19 @@ set(FLANN_DEFINITIONS ${PC_FLANN_CFLAGS_OTHER}) find_path(FLANN_INCLUDE_DIR flann/flann.hpp HINTS ${PC_FLANN_INCLUDEDIR} ${PC_FLANN_INCLUDE_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" - PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" + PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" PATH_SUFFIXES include) find_library(FLANN_LIBRARY NAMES ${FLANN_RELEASE_NAME} HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" - PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" + PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" PATH_SUFFIXES lib) -find_library(FLANN_LIBRARY_DEBUG +find_library(FLANN_LIBRARY_DEBUG NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME} HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" - PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" + PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" PATH_SUFFIXES lib) if(NOT FLANN_LIBRARY_DEBUG) diff --git a/examples/keypoints/CMakeLists.txt b/examples/keypoints/CMakeLists.txt index 1a09ddc5c64..6464a43f900 100644 --- a/examples/keypoints/CMakeLists.txt +++ b/examples/keypoints/CMakeLists.txt @@ -2,7 +2,7 @@ if(BUILD_visualization) PCL_SUBSYS_DEPEND(build ${SUBSYS_NAME} DEPS visualization) - ## Find VTK + ## Find VTK if(NOT VTK_FOUND) set(DEFAULT FALSE) set(REASON "VTK was not found.") @@ -11,7 +11,7 @@ if(BUILD_visualization) set(REASON) include(${VTK_USE_FILE}) endif() - + PCL_ADD_EXAMPLE(pcl_example_sift_keypoint_estimation FILES example_sift_keypoint_estimation.cpp LINK_WITH pcl_common pcl_visualization pcl_keypoints pcl_io) PCL_ADD_EXAMPLE(pcl_example_sift_normal_keypoint_estimation FILES example_sift_normal_keypoint_estimation.cpp diff --git a/examples/segmentation/CMakeLists.txt b/examples/segmentation/CMakeLists.txt index 231df4c24da..efb1e88cb4f 100644 --- a/examples/segmentation/CMakeLists.txt +++ b/examples/segmentation/CMakeLists.txt @@ -7,7 +7,7 @@ if(BUILD_visualization) PCL_ADD_EXAMPLE(pcl_example_region_growing FILES example_region_growing.cpp LINK_WITH pcl_common pcl_keypoints pcl_io pcl_segmentation) - ## Find VTK + ## Find VTK if(VTK_FOUND) include(${VTK_USE_FILE}) PCL_ADD_EXAMPLE(pcl_example_supervoxels FILES example_supervoxels.cpp diff --git a/examples/stereo/CMakeLists.txt b/examples/stereo/CMakeLists.txt index 115f39aff35..4c0e85c2eba 100644 --- a/examples/stereo/CMakeLists.txt +++ b/examples/stereo/CMakeLists.txt @@ -3,7 +3,7 @@ if(BUILD_visualization) PCL_SUBSYS_DEPEND(build ${SUBSYS_NAME} DEPS visualization) - ## Find VTK + ## Find VTK if(NOT VTK_FOUND) set(DEFAULT FALSE) set(REASON "VTK was not found.") @@ -12,8 +12,8 @@ if(BUILD_visualization) set(REASON) include(${VTK_USE_FILE}) endif() - + PCL_ADD_EXAMPLE(pcl_example_stereo_baseline FILES example_stereo_baseline.cpp LINK_WITH pcl_common pcl_visualization pcl_stereo pcl_io ) - + endif() diff --git a/examples/surface/CMakeLists.txt b/examples/surface/CMakeLists.txt index 26ada97bdbe..8a3da9ead06 100644 --- a/examples/surface/CMakeLists.txt +++ b/examples/surface/CMakeLists.txt @@ -1,8 +1,8 @@ if(BUILD_surface_on_nurbs) if(BUILD_visualization) PCL_SUBSYS_DEPEND(build ${SUBSYS_NAME} DEPS visualization geometry surface) - - ## Find VTK + + ## Find VTK if(NOT VTK_FOUND) set(DEFAULT FALSE) set(REASON "VTK was not found.") @@ -11,11 +11,11 @@ if(BUILD_surface_on_nurbs) set(REASON) include(${VTK_USE_FILE}) endif() - + PCL_ADD_EXAMPLE(pcl_test_nurbs_fitting_surface FILES test_nurbs_fitting_surface.cpp LINK_WITH pcl_common pcl_io pcl_surface pcl_visualization) - + PCL_ADD_EXAMPLE(pcl_example_nurbs_fitting_surface FILES example_nurbs_fitting_surface.cpp LINK_WITH pcl_common pcl_io pcl_surface pcl_visualization) @@ -23,23 +23,23 @@ if(BUILD_surface_on_nurbs) PCL_ADD_EXAMPLE(pcl_example_nurbs_viewer_surface FILES example_nurbs_viewer_surface.cpp LINK_WITH pcl_common pcl_io pcl_surface pcl_visualization) - + PCL_ADD_EXAMPLE(pcl_example_nurbs_fitting_closed_curve FILES example_nurbs_fitting_closed_curve.cpp LINK_WITH pcl_common pcl_io pcl_surface pcl_visualization) - + PCL_ADD_EXAMPLE(pcl_example_nurbs_fitting_curve2d FILES example_nurbs_fitting_curve2d.cpp LINK_WITH pcl_common pcl_io pcl_surface pcl_visualization) - + PCL_ADD_EXAMPLE(pcl_example_nurbs_fitting_closed_curve3d FILES example_nurbs_fitting_closed_curve3d.cpp LINK_WITH pcl_common pcl_io pcl_surface pcl_visualization) - + # PCL_ADD_EXAMPLE(pcl_test_nurbs_fitting_object # FILES test_nurbs_fitting_object.cpp # LINK_WITH pcl_common pcl_io pcl_surface pcl_visualization) - + # PCL_ADD_EXAMPLE(pcl_example_nurbs_fitting_object # FILES example_nurbs_fitting_object.cpp # LINK_WITH pcl_common pcl_io pcl_surface pcl_visualization) @@ -47,11 +47,11 @@ if(BUILD_surface_on_nurbs) # PCL_ADD_EXAMPLE(pcl_example_nurbs_fitting_cube # FILES example_nurbs_fitting_cube.cpp # LINK_WITH pcl_common pcl_io pcl_surface pcl_visualization) - + # PCL_ADD_EXAMPLE(pcl_example_nurbs_fitting_topo # FILES example_nurbs_fitting_topo.cpp # LINK_WITH pcl_common pcl_io pcl_surface pcl_visualization) - + endif() endif() diff --git a/features/CMakeLists.txt b/features/CMakeLists.txt index 589cd5534d4..4c63606beed 100644 --- a/features/CMakeLists.txt +++ b/features/CMakeLists.txt @@ -152,19 +152,19 @@ if(build) src/grsd.cpp src/statistical_multiscale_interest_region_extraction.cpp src/vfh.cpp - src/esf.cpp + src/esf.cpp src/3dsc.cpp src/usc.cpp src/range_image_border_extractor.cpp ) - + if(MSVC) # Workaround to avoid hitting the MSVC 4GB linker memory limit when building pcl_features. # Disable whole program optimization (/GL) and link-time code generation (/LTCG). string(REPLACE "/GL" "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - string(REPLACE "/LTCG" "" CMAKE_SHARED_LINKER_FLAGS_RELEASE ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}) + string(REPLACE "/LTCG" "" CMAKE_SHARED_LINKER_FLAGS_RELEASE ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}) endif() - + set(LIB_NAME "pcl_${SUBSYS_NAME}") PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${incs} ${impl_incs}) target_link_libraries("${LIB_NAME}" pcl_common pcl_search pcl_kdtree pcl_octree pcl_filters) diff --git a/gpu/CMakeLists.txt b/gpu/CMakeLists.txt index 11db2bbdca9..12fa7852a88 100644 --- a/gpu/CMakeLists.txt +++ b/gpu/CMakeLists.txt @@ -5,7 +5,7 @@ set(SUBSYS_DEPS ) OPTION(BUILD_GPU "Build the GPU-related subsystems" ${DEFAULT}) if(BUILD_GPU AND CUDA_FOUND) - + if(CMAKE_COMPILER_IS_GNUCXX) string(REPLACE "-Wold-style-cast" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") string(REPLACE "-Wno-invalid-offsetof" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") @@ -14,13 +14,13 @@ if(BUILD_GPU AND CUDA_FOUND) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable") endif() endif() - + collect_subproject_directory_names("${CMAKE_CURRENT_SOURCE_DIR}" "CMakeLists.txt" PCL_GPU_MODULES_NAMES PCL_GPU_MODULES_DIRS) set(PCL_GPU_MODULES_NAMES_UNSORTED ${PCL_GPU_MODULES_NAMES}) topological_sort(PCL_GPU_MODULES_NAMES PCL_ _DEPENDS) sort_relative(PCL_GPU_MODULES_NAMES_UNSORTED PCL_GPU_MODULES_NAMES PCL_GPU_MODULES_DIRS) foreach(subdir ${PCL_GPU_MODULES_DIRS}) add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/${subdir}") - endforeach(subdir) + endforeach(subdir) endif() diff --git a/gpu/features/CMakeLists.txt b/gpu/features/CMakeLists.txt index 2e2c140e66d..7484d116e80 100644 --- a/gpu/features/CMakeLists.txt +++ b/gpu/features/CMakeLists.txt @@ -13,9 +13,9 @@ if(build) FILE(GLOB incs include/pcl/gpu/features/*.hpp) FILE(GLOB srcs src/*.cpp src/*.hpp) FILE(GLOB cuda src/*.cu) - FILE(GLOB dev_incs include/pcl/gpu/features/device/*.h*) + FILE(GLOB dev_incs include/pcl/gpu/features/device/*.h*) source_group("Header Files\\device" FILES ${dev_incs}) - source_group("Source Files\\cuda" FILES ${cuda} ) + source_group("Source Files\\cuda" FILES ${cuda} ) source_group("Source Files" FILES ${srcs} ) FILE(GLOB srcs_utils src/utils/*.hpp) @@ -33,6 +33,6 @@ if(build) # Install include files PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_PATH}" ${incs}) PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_PATH}/device" ${dev_incs}) - + add_subdirectory(test) endif() diff --git a/gpu/features/test/CMakeLists.txt b/gpu/features/test/CMakeLists.txt index 7710cb68500..4d6e23ccef1 100644 --- a/gpu/features/test/CMakeLists.txt +++ b/gpu/features/test/CMakeLists.txt @@ -2,11 +2,11 @@ if(BUILD_TESTS) 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) @@ -15,16 +15,16 @@ if(BUILD_TESTS) get_filename_component(INC5 "${DIR}/../../../common/include" REALPATH) get_filename_component(INC6 "${DIR}/../../../search/include" REALPATH) get_filename_component(INC7 "${DIR}/../../../octree/include" REALPATH) - - + + #find_library(VTK) - + #set(INC6 "d:/svn/pcl_3rdparty/vtk-5.6.1/Common/" "d:/svn/pcl_3rdparty/vtk-5.6.1/bin/" "d:/svn/pcl_3rdparty/vtk-5.6.1/Rendering/") - + FILE(GLOB test_src *.cpp *.hpp) list(APPEND test_src ${pcl_gtest_sources}) include_directories("${INC1}" "${INC2}" "${INC3}" "${INC4}" "${INC5}" "${INC6}" "${INC7}" ${VTK_INCLUDE_DIRS}) #PCL_ADD_TEST(a_gpu_features_test ${the_test_target} FILES ${test_src} LINK_WITH pcl_gpu_containers pcl_gpu_octree pcl_gpu_features pcl_io pcl_features pcl_visualization pcl_common) - - #add_dependencies(${the_test_target} pcl_gpu_octree pcl_gpu_containes pcl_gpu_features pcl_io pcl_features pcl_visualization pcl_common) + + #add_dependencies(${the_test_target} pcl_gpu_octree pcl_gpu_containes pcl_gpu_features pcl_io pcl_features pcl_visualization pcl_common) endif() diff --git a/gpu/kinfu/tools/CMakeLists.txt b/gpu/kinfu/tools/CMakeLists.txt index 61292ddcf08..c075a5c79dc 100644 --- a/gpu/kinfu/tools/CMakeLists.txt +++ b/gpu/kinfu/tools/CMakeLists.txt @@ -11,7 +11,7 @@ if(WITH_OPENNI) endif() FILE(GLOB hdrs "*.h*") - include_directories(${VTK_INCLUDE_DIRS} ${OPENNI_INCLUDE_DIRS}) + include_directories(${VTK_INCLUDE_DIRS} ${OPENNI_INCLUDE_DIRS}) ## KINECT FUSION set(the_target pcl_kinfu_app) @@ -21,7 +21,7 @@ if(WITH_OPENNI) PCL_ADD_EXECUTABLE_OPT_BUNDLE("${the_target}" "${SUBSYS_NAME}" ${srcs} ${hdrs}) target_link_libraries("${the_target}" pcl_common pcl_io ${OPENNI_LIBRARIES} pcl_visualization pcl_gpu_kinfu) - + if(OpenCV_FOUND) target_link_libraries("${the_target}" ${OpenCV_LIBS}) endif() diff --git a/gpu/kinfu_large_scale/CMakeLists.txt b/gpu/kinfu_large_scale/CMakeLists.txt index 060ba03b7da..f0ca3e0db0a 100644 --- a/gpu/kinfu_large_scale/CMakeLists.txt +++ b/gpu/kinfu_large_scale/CMakeLists.txt @@ -27,53 +27,53 @@ if(build) FILE(GLOB cuda src/cuda/*.cu src/cuda/*.h*) #FILE(GLOB tsdf src/cuda/tsdf_volume.cu) #FILE(GLOB est src/cuda/estimate_tranform.cu) - - source_group("Source Files\\cuda" FILES ${cuda} ) - source_group("Source Files" FILES ${srcs} ) - + + 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}) if(UNIX OR APPLE) - set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler;-fPIC;") + set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler;-fPIC;") endif() - + if(NOT UNIX OR APPLE) add_definitions(-DPCLAPI_EXPORTS) endif() - + #set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-gencode;arch=compute_11,code=compute_11;-gencode;arch=compute_12,code=compute_12") - + if(TRUE) #list(REMOVE_ITEM cuda ${est}) - #CUDA_COMPILE(est_objs ${est}) - - set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "--ftz=true;--prec-div=false;--prec-sqrt=false") - CUDA_COMPILE(cuda_objs ${cuda}) - + #CUDA_COMPILE(est_objs ${est}) + + set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "--ftz=true;--prec-div=false;--prec-sqrt=false") + CUDA_COMPILE(cuda_objs ${cuda}) + #LIST(APPEND cuda ${est}) #LIST(APPEND cuda_objs ${est_objs}) - - else() + + else() list(REMOVE_ITEM cuda ${tsdf}) - CUDA_COMPILE(cuda_objs ${cuda}) - set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "--ftz=true;--prec-div=false;--prec-sqrt=false") + CUDA_COMPILE(cuda_objs ${cuda}) + set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "--ftz=true;--prec-div=false;--prec-sqrt=false") CUDA_COMPILE(tsdf_obj ${tsdf}) - + LIST(APPEND cuda ${tsdf}) LIST(APPEND cuda_objs ${tsdf_obj}) endif() - + PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${incs} ${impl_incs} ${cuda} ${cuda_objs}) target_link_libraries("${LIB_NAME}" pcl_common pcl_io pcl_gpu_utils pcl_gpu_containers pcl_gpu_octree pcl_octree pcl_filters) - + set(EXT_DEPS "") #set(EXT_DEPS CUDA) PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "") # Install include files PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_PATH}" ${incs}) - + add_subdirectory(test) add_subdirectory(tools) endif() diff --git a/gpu/kinfu_large_scale/tools/CMakeLists.txt b/gpu/kinfu_large_scale/tools/CMakeLists.txt index 4c127ea46fa..c5aee1d8994 100644 --- a/gpu/kinfu_large_scale/tools/CMakeLists.txt +++ b/gpu/kinfu_large_scale/tools/CMakeLists.txt @@ -31,20 +31,20 @@ if(WITH_OPENNI) PCL_ADD_EXECUTABLE_OPT_BUNDLE("${the_target}" "${SUBSYS_NAME}" ${srcs} ${hdrs}) target_link_libraries("${the_target}" pcl_common pcl_io ${OPENNI_LIBRARIES} pcl_visualization pcl_gpu_kinfu_large_scale pcl_octree) - + ## STANDALONE MARCHING CUBES set(the_target pcl_kinfu_largeScale_mesh_output) set(srcs process_kinfu_large_scale_output.cpp) PCL_ADD_EXECUTABLE_OPT_BUNDLE("${the_target}" "${SUBSYS_NAME}" ${srcs} ${hdrs}) target_link_libraries("${the_target}" pcl_common pcl_io ${OPENNI_LIBRARIES} pcl_visualization pcl_gpu_kinfu_large_scale pcl_filters) - + ## RECORD MAPS_RGB set(the_target pcl_record_kinect_maps_rgb) set(srcs record_maps_rgb.cpp) PCL_ADD_EXECUTABLE_OPT_BUNDLE("${the_target}" "${SUBSYS_NAME}" ${srcs} ${hdrs}) target_link_libraries("${the_target}" pcl_common pcl_io ${OPENNI_LIBRARIES} pcl_visualization pcl_gpu_kinfu_large_scale pcl_filters) - + endif() diff --git a/gpu/octree/CMakeLists.txt b/gpu/octree/CMakeLists.txt index ee50e096b40..091f3107c30 100644 --- a/gpu/octree/CMakeLists.txt +++ b/gpu/octree/CMakeLists.txt @@ -9,7 +9,7 @@ mark_as_advanced("BUILD_${SUBSYS_NAME}") PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS}) PCL_SET_SUBSYS_INCLUDE_DIR("${SUBSYS_NAME}" "${SUBSYS_PATH}") -if(build) +if(build) FILE(GLOB incs include/pcl/gpu/octree/*.hpp) FILE(GLOB srcs src/*.cpp src/*.hpp src/*.cu) source_group("Source Files" FILES ${srcs}) @@ -30,7 +30,7 @@ if(build) set(EXT_DEPS "") #set(EXT_DEPS CUDA) PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "") - + # Install include files PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_PATH}" ${incs}) diff --git a/gpu/octree/test/CMakeLists.txt b/gpu/octree/test/CMakeLists.txt index d9827e7d3c7..0adfd73df85 100644 --- a/gpu/octree/test/CMakeLists.txt +++ b/gpu/octree/test/CMakeLists.txt @@ -8,5 +8,5 @@ if(BUILD_TESTS) FILE(GLOB test_src *.cpp *.hpp) #PCL_ADD_TEST(a_gpu_octree_test "${the_test_target}" FILES ${test_src} LINK_WITH pcl_octree pcl_gpu_containers pcl_gpu_octree) #add_dependencies("${the_test_target}" pcl_octree pcl_gpu_containes pcl_gpu_octree) - + endif() diff --git a/gpu/people/CMakeLists.txt b/gpu/people/CMakeLists.txt index bb5a2642807..b5c1a72a69a 100644 --- a/gpu/people/CMakeLists.txt +++ b/gpu/people/CMakeLists.txt @@ -13,7 +13,7 @@ PCL_ADD_DOC("${SUBSYS_NAME}") if(build) REMOVE_VTK_DEFINITIONS() #find_package(OpenCV QUIET) - + #find NPP unset(CUDA_npp_LIBRARY CACHE) if(${CUDA_VERSION} VERSION_LESS "5.5") @@ -44,7 +44,7 @@ if(build) FILE(GLOB hdrs_cuda src/cuda/nvidia/*.h*) source_group("Source files\\cuda" FILES ${srcs_cuda} ) - source_group("Source files" FILES ${srcs} ) + 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") diff --git a/gpu/surface/CMakeLists.txt b/gpu/surface/CMakeLists.txt index 7d0c69f80e0..ce7afdd995a 100644 --- a/gpu/surface/CMakeLists.txt +++ b/gpu/surface/CMakeLists.txt @@ -9,7 +9,7 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS}) PCL_SET_SUBSYS_INCLUDE_DIR("${SUBSYS_NAME}" "${SUBSYS_PATH}") mark_as_advanced("BUILD_${SUBSYS_NAME}") -if(build) +if(build) FILE(GLOB incs include/pcl/gpu/surface/*.h) FILE(GLOB srcs src/*.cpp src/*.h*) source_group("Source Files" FILES ${srcs}) @@ -22,9 +22,9 @@ if(build) LIST(APPEND srcs ${utils} ${cuda}) - + include_directories(${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") PCL_CUDA_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${incs}) @@ -33,9 +33,9 @@ if(build) set(EXT_DEPS "") #set(EXT_DEPS CUDA) PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "") - + # Install include files PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_PATH}" ${incs}) - + add_subdirectory(test) endif() diff --git a/gpu/surface/test/CMakeLists.txt b/gpu/surface/test/CMakeLists.txt index 89d8853d960..c72dbf2c7b9 100644 --- a/gpu/surface/test/CMakeLists.txt +++ b/gpu/surface/test/CMakeLists.txt @@ -1,7 +1,7 @@ if(BUILD_TESTS) - + 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) @@ -12,9 +12,9 @@ if(BUILD_TESTS) 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}" ${VTK_INCLUDE_DIRS}) - - FILE(GLOB test_src *.cpp *.hpp) + + 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) - + endif() diff --git a/gpu/tracking/CMakeLists.txt b/gpu/tracking/CMakeLists.txt index f4b148c757f..9877ef2e562 100644 --- a/gpu/tracking/CMakeLists.txt +++ b/gpu/tracking/CMakeLists.txt @@ -9,7 +9,7 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS}) PCL_SET_SUBSYS_INCLUDE_DIR("${SUBSYS_NAME}" "${SUBSYS_PATH}") mark_as_advanced("BUILD_${SUBSYS_NAME}") -if(build) +if(build) FILE(GLOB incs include/pcl/gpu/tracking/*.h) FILE(GLOB srcs src/*.cpp src/*.h*) source_group("Source Files" FILES ${srcs}) @@ -30,8 +30,8 @@ if(build) set(EXT_DEPS "") #set(EXT_DEPS CUDA) PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "") - + # Install include files PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_PATH}" ${incs}) - + endif() diff --git a/gpu/utils/CMakeLists.txt b/gpu/utils/CMakeLists.txt index b3bf676be6f..b4e95c1492b 100644 --- a/gpu/utils/CMakeLists.txt +++ b/gpu/utils/CMakeLists.txt @@ -9,13 +9,13 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS}) PCL_SET_SUBSYS_INCLUDE_DIR("${SUBSYS_NAME}" "${SUBSYS_PATH}") mark_as_advanced("BUILD_${SUBSYS_NAME}") -if(build) - FILE(GLOB incs include/pcl/gpu/utils/*.h*) +if(build) + FILE(GLOB incs include/pcl/gpu/utils/*.h*) FILE(GLOB srcs src/*.cpp src/*.cu src/*.h*) - FILE(GLOB dev_incs include/pcl/gpu/utils/device/*.h*) + FILE(GLOB dev_incs include/pcl/gpu/utils/device/*.h*) source_group("Header Files\\device" FILES ${dev_incs}) source_group("Source Files" FILES ${srcs}) - + set(LIB_NAME "pcl_${SUBSYS_NAME}") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_CUDA_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${dev_incs} ${incs} ${srcs}) diff --git a/kdtree/CMakeLists.txt b/kdtree/CMakeLists.txt index ee34af92f0e..4255fef24de 100644 --- a/kdtree/CMakeLists.txt +++ b/kdtree/CMakeLists.txt @@ -9,18 +9,18 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS} EXT_DEPS flann) PCL_ADD_DOC("${SUBSYS_NAME}") if(build) - set(srcs + set(srcs src/kdtree_flann.cpp ) - set(incs + set(incs "include/pcl/${SUBSYS_NAME}/kdtree.h" "include/pcl/${SUBSYS_NAME}/io.h" "include/pcl/${SUBSYS_NAME}/flann.h" "include/pcl/${SUBSYS_NAME}/kdtree_flann.h" ) - set(impl_incs + set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/io.hpp" "include/pcl/${SUBSYS_NAME}/impl/kdtree_flann.hpp" ) diff --git a/keypoints/CMakeLists.txt b/keypoints/CMakeLists.txt index 68939bcbbb5..efc0983c69b 100644 --- a/keypoints/CMakeLists.txt +++ b/keypoints/CMakeLists.txt @@ -20,7 +20,7 @@ if(build) src/iss_3d.cpp src/brisk_2d.cpp src/trajkovic_2d.cpp - src/trajkovic_3d.cpp + src/trajkovic_3d.cpp ) set(incs "include/pcl/${SUBSYS_NAME}/keypoint.h" @@ -36,7 +36,7 @@ if(build) "include/pcl/${SUBSYS_NAME}/iss_3d.h" "include/pcl/${SUBSYS_NAME}/brisk_2d.h" "include/pcl/${SUBSYS_NAME}/trajkovic_2d.h" - "include/pcl/${SUBSYS_NAME}/trajkovic_3d.h" + "include/pcl/${SUBSYS_NAME}/trajkovic_3d.h" ) set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/keypoint.hpp" @@ -50,9 +50,9 @@ if(build) "include/pcl/${SUBSYS_NAME}/impl/iss_3d.hpp" "include/pcl/${SUBSYS_NAME}/impl/brisk_2d.hpp" "include/pcl/${SUBSYS_NAME}/impl/trajkovic_2d.hpp" - "include/pcl/${SUBSYS_NAME}/impl/trajkovic_3d.hpp" + "include/pcl/${SUBSYS_NAME}/impl/trajkovic_3d.hpp" ) - + set(LIB_NAME "pcl_${SUBSYS_NAME}") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${incs} ${impl_incs}) diff --git a/ml/CMakeLists.txt b/ml/CMakeLists.txt index c5c59416595..5565419863f 100644 --- a/ml/CMakeLists.txt +++ b/ml/CMakeLists.txt @@ -9,7 +9,7 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS}) PCL_ADD_DOC("${SUBSYS_NAME}") if(build) - set(incs + set(incs "include/pcl/${SUBSYS_NAME}/branch_estimator.h" "include/pcl/${SUBSYS_NAME}/feature_handler.h" "include/pcl/${SUBSYS_NAME}/multi_channel_2d_comparison_feature.h" @@ -73,7 +73,7 @@ if(build) #src/permutohedralORI.cpp #src/filter.cpp #src/util.cpp - #src/densecrfORI.cpp + #src/densecrfORI.cpp src/svm_wrapper.cpp src/svm.cpp src/kmeans.cpp diff --git a/octree/CMakeLists.txt b/octree/CMakeLists.txt index 3d71e05d1d9..194ada9c7e8 100644 --- a/octree/CMakeLists.txt +++ b/octree/CMakeLists.txt @@ -12,7 +12,7 @@ if(build) set(srcs src/octree_inst.cpp ) - set(incs + set(incs "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/octree_base.h" "include/pcl/${SUBSYS_NAME}/octree_container.h" @@ -34,7 +34,7 @@ if(build) "include/pcl/${SUBSYS_NAME}/octree_pointcloud_adjacency_container.h" ) - set(impl_incs + set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/octree_base.hpp" "include/pcl/${SUBSYS_NAME}/impl/octree_pointcloud.hpp" "include/pcl/${SUBSYS_NAME}/impl/octree2buf_base.hpp" @@ -50,7 +50,7 @@ if(build) target_include_directories(${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "") - + # Install include files PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs}) PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs}) diff --git a/outofcore/CMakeLists.txt b/outofcore/CMakeLists.txt index 20bf132b2bf..33c67cf3249 100644 --- a/outofcore/CMakeLists.txt +++ b/outofcore/CMakeLists.txt @@ -55,7 +55,7 @@ if(build) "include/pcl/${SUBSYS_NAME}/visualization/viewport.h" ) set(LIB_NAME "pcl_${SUBSYS_NAME}") - + include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${incs} ${impl_incs} ${visualization_incs}) #PCL_ADD_SSE_FLAGS("${LIB_NAME}") @@ -70,5 +70,5 @@ if(build) if(BUILD_tools) add_subdirectory(tools) endif() - + endif() diff --git a/outofcore/tools/CMakeLists.txt b/outofcore/tools/CMakeLists.txt index 705b6e21e4c..3f008937c9a 100644 --- a/outofcore/tools/CMakeLists.txt +++ b/outofcore/tools/CMakeLists.txt @@ -14,10 +14,10 @@ else() set(VTK_USE_FILE "${VTK_USE_FILE}" CACHE INTERNAL "VTK_USE_FILE") include("${VTK_USE_FILE}") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") - + if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" VERSION_GREATER "5.8") # pcl_outofcore_viewer uses some functions not present in vtk 5.8 - + set(srcs outofcore_viewer.cpp ../src/visualization/camera.cpp ../src/visualization/common.cpp @@ -26,10 +26,10 @@ else() ../src/visualization/outofcore_cloud.cpp ../src/visualization/scene.cpp ../src/visualization/viewport.cpp) - + # pcl_outofcore_viewer PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_outofcore_viewer "${SUBSYS_NAME}" ${srcs}) target_link_libraries(pcl_outofcore_viewer pcl_common pcl_io pcl_outofcore pcl_visualization pcl_octree pcl_filters) - + endif() endif() diff --git a/people/CMakeLists.txt b/people/CMakeLists.txt index 755bc2b81c0..17697313ea8 100644 --- a/people/CMakeLists.txt +++ b/people/CMakeLists.txt @@ -20,7 +20,7 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS}) PCL_ADD_DOC("${SUBSYS_NAME}") if(build) - set(incs + set(incs "include/pcl/${SUBSYS_NAME}/ground_based_people_detection_app.h" "include/pcl/${SUBSYS_NAME}/head_based_subcluster.h" "include/pcl/${SUBSYS_NAME}/height_map_2d.h" @@ -47,7 +47,7 @@ if(build) # Install include files PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs}) PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs}) - + #SET_TARGET_PROPERTIES("${LIB_NAME}" PROPERTIES LINKER_LANGUAGE CXX) if(WITH_OPENNI) diff --git a/recognition/CMakeLists.txt b/recognition/CMakeLists.txt index 595ce516716..94b3b6a2c8c 100644 --- a/recognition/CMakeLists.txt +++ b/recognition/CMakeLists.txt @@ -16,7 +16,7 @@ if(build) "include/pcl/${SUBSYS_NAME}/impl/linemod/line_rgbd.hpp" ) - set(incs + set(incs "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/color_gradient_dot_modality.h" "include/pcl/${SUBSYS_NAME}/color_gradient_modality.h" @@ -50,7 +50,7 @@ if(build) "include/pcl/${SUBSYS_NAME}/ransac_based/bvh.h" ) - set(ransac_based_incs + set(ransac_based_incs "include/pcl/${SUBSYS_NAME}/ransac_based/auxiliary.h" "include/pcl/${SUBSYS_NAME}/ransac_based/hypothesis.h" "include/pcl/${SUBSYS_NAME}/ransac_based/model_library.h" @@ -78,7 +78,7 @@ if(build) "include/pcl/${SUBSYS_NAME}/face_detection/face_detector_data_provider.h" "include/pcl/${SUBSYS_NAME}/face_detection/rf_face_detector_trainer.h" "include/pcl/${SUBSYS_NAME}/face_detection/rf_face_utils.h" - ) + ) set(cg_incs "include/pcl/${SUBSYS_NAME}/cg/correspondence_grouping.h" @@ -86,7 +86,7 @@ if(build) "include/pcl/${SUBSYS_NAME}/cg/geometric_consistency.h" ) - set(impl_incs + set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/linemod/line_rgbd.hpp" "include/pcl/${SUBSYS_NAME}/impl/ransac_based/simple_octree.hpp" "include/pcl/${SUBSYS_NAME}/impl/ransac_based/voxel_structure.hpp" @@ -130,7 +130,7 @@ if(build) src/face_detection/rf_face_detector_trainer.cpp src/implicit_shape_model.cpp ) - + if(HAVE_METSLIB) set(metslib_incs "") else() @@ -158,7 +158,7 @@ if(build) PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/hv" ${hv_incs}) PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/cg" ${cg_incs}) PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/face_detection" ${face_detection_incs}) - + PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs}) PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl/ransac_based" ${ransac_based_impl_incs}) PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl/hv" ${hv_impl_incs}) diff --git a/registration/CMakeLists.txt b/registration/CMakeLists.txt index ed9de65b2dc..83946106861 100644 --- a/registration/CMakeLists.txt +++ b/registration/CMakeLists.txt @@ -9,7 +9,7 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS}) PCL_ADD_DOC("${SUBSYS_NAME}") if(build) - set(incs + set(incs "include/pcl/${SUBSYS_NAME}/eigen.h" "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/boost_graph.h" @@ -77,7 +77,7 @@ if(build) "include/pcl/${SUBSYS_NAME}/transformation_estimation_3point.h" ) - set(impl_incs + set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/default_convergence_criteria.hpp" "include/pcl/${SUBSYS_NAME}/impl/correspondence_estimation.hpp" "include/pcl/${SUBSYS_NAME}/impl/correspondence_estimation_normal_shooting.hpp" diff --git a/sample_consensus/CMakeLists.txt b/sample_consensus/CMakeLists.txt index 060ef902e4a..696ebfada72 100644 --- a/sample_consensus/CMakeLists.txt +++ b/sample_consensus/CMakeLists.txt @@ -9,7 +9,7 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS}) PCL_ADD_DOC("${SUBSYS_NAME}") if(build) - set(srcs + set(srcs src/sac.cpp src/sac_model_circle.cpp src/sac_model_circle3d.cpp @@ -26,7 +26,7 @@ if(build) src/sac_model_sphere.cpp ) - set(incs + set(incs "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/eigen.h" "include/pcl/${SUBSYS_NAME}/lmeds.h" @@ -58,7 +58,7 @@ if(build) "include/pcl/${SUBSYS_NAME}/sac_model_sphere.h" ) - set(impl_incs + set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/lmeds.hpp" "include/pcl/${SUBSYS_NAME}/impl/mlesac.hpp" "include/pcl/${SUBSYS_NAME}/impl/msac.hpp" diff --git a/segmentation/CMakeLists.txt b/segmentation/CMakeLists.txt index 8b731d943bf..10d7c9fe54e 100644 --- a/segmentation/CMakeLists.txt +++ b/segmentation/CMakeLists.txt @@ -9,7 +9,7 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS}) PCL_ADD_DOC("${SUBSYS_NAME}") if(build) - set(srcs + set(srcs src/extract_clusters.cpp src/extract_polygonal_prism_data.cpp src/sac_segmentation.cpp @@ -38,7 +38,7 @@ if(build) ) endif() - set(incs + set(incs "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/extract_clusters.h" "include/pcl/${SUBSYS_NAME}/extract_labeled_clusters.h" @@ -85,7 +85,7 @@ if(build) ) endif() - set(impl_incs + set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/extract_clusters.hpp" "include/pcl/${SUBSYS_NAME}/impl/extract_labeled_clusters.hpp" "include/pcl/${SUBSYS_NAME}/impl/extract_polygonal_prism_data.hpp" diff --git a/simulation/CMakeLists.txt b/simulation/CMakeLists.txt index 60d2f2a1599..7660e7ba1e0 100644 --- a/simulation/CMakeLists.txt +++ b/simulation/CMakeLists.txt @@ -10,9 +10,9 @@ PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" OFF) PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS} EXT_DEPS opengl glew) PCL_ADD_DOC("${SUBSYS_NAME}") - + if(build) - set(srcs + set(srcs src/camera.cpp src/model.cpp src/range_likelihood.cpp @@ -21,7 +21,7 @@ if(build) src/sum_reduce.cpp ) - set(incs + set(incs "include/pcl/${SUBSYS_NAME}/camera.h" "include/pcl/${SUBSYS_NAME}/model.h" "include/pcl/${SUBSYS_NAME}/range_likelihood.h" diff --git a/simulation/tools/CMakeLists.txt b/simulation/tools/CMakeLists.txt index f40e7f6d25e..d5a8e5d9e88 100644 --- a/simulation/tools/CMakeLists.txt +++ b/simulation/tools/CMakeLists.txt @@ -6,20 +6,20 @@ if(GLEW_FOUND) include_directories(${VTK_INCLUDE_DIRS}) PCL_ADD_EXECUTABLE(pcl_sim_viewer ${SUBSYS_NAME} sim_viewer.cpp) - target_link_libraries (pcl_sim_viewer - ${VTK_IO_TARGET_LINK_LIBRARIES} pcl_kdtree - pcl_simulation pcl_common pcl_io pcl_visualization + target_link_libraries (pcl_sim_viewer + ${VTK_IO_TARGET_LINK_LIBRARIES} pcl_kdtree + pcl_simulation pcl_common pcl_io pcl_visualization ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES}) PCL_ADD_EXECUTABLE(pcl_sim_test_simple ${SUBSYS_NAME} sim_test_simple.cpp) target_link_libraries (pcl_sim_test_simple - ${VTK_IO_TARGET_LINK_LIBRARIES} - pcl_simulation pcl_common pcl_io pcl_visualization + ${VTK_IO_TARGET_LINK_LIBRARIES} + pcl_simulation pcl_common pcl_io pcl_visualization ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES}) PCL_ADD_EXECUTABLE(pcl_sim_test_performance ${SUBSYS_NAME} sim_test_performance.cpp) - target_link_libraries (pcl_sim_test_performance - ${VTK_IO_TARGET_LINK_LIBRARIES} + target_link_libraries (pcl_sim_test_performance + ${VTK_IO_TARGET_LINK_LIBRARIES} pcl_simulation pcl_common pcl_io pcl_visualization ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES}) @@ -28,14 +28,14 @@ if(GLEW_FOUND) set(LIB_NAME pcl_simulation_io) PCL_ADD_LIBRARY(${LIB_NAME} ${SUBSYS_NAME} ${srcs} ${incs} ${compression_incs} ${impl_incs} - ${VTK_IO_TARGET_LINK_LIBRARIES} + ${VTK_IO_TARGET_LINK_LIBRARIES} ${OPENNI_INCLUDES}) - target_link_libraries(${LIB_NAME} pcl_simulation pcl_common pcl_io + target_link_libraries(${LIB_NAME} pcl_simulation pcl_common pcl_io ${VTK_IO_TARGET_LINK_LIBRARIES} ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES}) PCL_ADD_EXECUTABLE(pcl_sim_terminal_demo ${SUBSYS_NAME} sim_terminal_demo.cpp) target_link_libraries (pcl_sim_terminal_demo - ${VTK_IO_TARGET_LINK_LIBRARIES} + ${VTK_IO_TARGET_LINK_LIBRARIES} pcl_simulation pcl_common pcl_io pcl_visualization pcl_simulation_io ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES}) endif() diff --git a/surface/CMakeLists.txt b/surface/CMakeLists.txt index 030854c1d54..b55c97ffb16 100644 --- a/surface/CMakeLists.txt +++ b/surface/CMakeLists.txt @@ -24,12 +24,12 @@ if(build) src/convex_hull.cpp ) endif() - + if(VTK_FOUND AND NOT ANDROID) set(VTK_USE_FILE "${VTK_USE_FILE}" CACHE INTERNAL "VTK_USE_FILE") include("${VTK_USE_FILE}") - - set(VTK_SMOOTHING_INCLUDES + + set(VTK_SMOOTHING_INCLUDES "include/pcl/${SUBSYS_NAME}/vtk_smoothing/vtk.h" "include/pcl/${SUBSYS_NAME}/vtk_smoothing/vtk_utils.h" "include/pcl/${SUBSYS_NAME}/vtk_smoothing/vtk_mesh_subdivision.h" @@ -37,24 +37,24 @@ if(build) "include/pcl/${SUBSYS_NAME}/vtk_smoothing/vtk_mesh_smoothing_laplacian.h" "include/pcl/${SUBSYS_NAME}/vtk_smoothing/vtk_mesh_smoothing_windowed_sinc.h") - set(VTK_SMOOTHING_SOURCE + set(VTK_SMOOTHING_SOURCE src/vtk_smoothing/vtk_utils.cpp src/vtk_smoothing/vtk_mesh_subdivision.cpp src/vtk_smoothing/vtk_mesh_quadric_decimation.cpp src/vtk_smoothing/vtk_mesh_smoothing_laplacian.cpp src/vtk_smoothing/vtk_mesh_smoothing_windowed_sinc.cpp) - + if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" VERSION_LESS "6.0") set(VTK_SMOOTHING_TARGET_LINK_LIBRARIES vtkCommon vtkWidgets vtkGraphics) else() set(VTK_SMOOTHING_TARGET_LINK_LIBRARIES vtkCommonCore vtkCommonDataModel vtkCommonExecutionModel vtkFiltersModeling) endif() endif() - + set(BUILD_surface_on_nurbs 0 CACHE BOOL "Fitting NURBS to point-clouds using openNURBS" ) if(BUILD_surface_on_nurbs) include(src/3rdparty/opennurbs/openNURBS.cmake) - include(src/on_nurbs/on_nurbs.cmake) + include(src/on_nurbs/on_nurbs.cmake) endif() set(POISSON_INCLUDES @@ -89,9 +89,9 @@ if(build) src/3rdparty/poisson4/geometry.cpp src/3rdparty/poisson4/marching_cubes_poisson.cpp ) - - set(srcs - src/processing.cpp + + set(srcs + src/processing.cpp src/ear_clipping.cpp src/gp3.cpp src/grid_projection.cpp @@ -112,7 +112,7 @@ if(build) ${ON_NURBS_SOURCES} ) - set(incs + set(incs "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/eigen.h" "include/pcl/${SUBSYS_NAME}/ear_clipping.h" @@ -137,7 +137,7 @@ if(build) # ${ON_NURBS_INCLUDES} ) - set(impl_incs + set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/gp3.hpp" "include/pcl/${SUBSYS_NAME}/impl/grid_projection.hpp" "include/pcl/${SUBSYS_NAME}/impl/marching_cubes.hpp" diff --git a/surface/src/on_nurbs/on_nurbs.cmake b/surface/src/on_nurbs/on_nurbs.cmake index 90e69285846..9f4c44cf5f4 100644 --- a/surface/src/on_nurbs/on_nurbs.cmake +++ b/surface/src/on_nurbs/on_nurbs.cmake @@ -44,7 +44,7 @@ set(ON_NURBS_SOURCES src/on_nurbs/sequential_fitter.cpp src/on_nurbs/sparse_mat.cpp src/on_nurbs/triangulation.cpp) - + set(USE_UMFPACK 0 CACHE BOOL "Use UmfPack for solving sparse systems of equations (e.g. in surface/on_nurbs)" ) if(USE_UMFPACK) set(ON_NURBS_SOURCES ${ON_NURBS_SOURCES} src/on_nurbs/nurbs_solve_umfpack.cpp) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 53b0459aa09..65bc7ddcfe4 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -12,7 +12,7 @@ if(build) include_directories(SYSTEM ${GTEST_INCLUDE_DIRS} ${GTEST_SRC_DIR}) add_library(pcl_gtest STATIC ${GTEST_SRC_DIR}/src/gtest-all.cc) - + if( MSVC11 ) # VS2012 doesn't correctly support variadic templates yet add_definitions("-D_VARIADIC_MAX=10") endif() diff --git a/test/features/CMakeLists.txt b/test/features/CMakeLists.txt index 3bc254223ba..f55ff9ddb47 100644 --- a/test/features/CMakeLists.txt +++ b/test/features/CMakeLists.txt @@ -81,7 +81,7 @@ if(build) PCL_ADD_TEST(feature_flare_estimation test_flare_estimation FILES test_flare_estimation.cpp LINK_WITH pcl_gtest pcl_features pcl_io - ARGUMENTS "${PCL_SOURCE_DIR}/test/bun0.pcd") + ARGUMENTS "${PCL_SOURCE_DIR}/test/bun0.pcd") PCL_ADD_TEST(feature_shot_lrf_estimation test_shot_lrf_estimation FILES test_shot_lrf_estimation.cpp LINK_WITH pcl_gtest pcl_features pcl_io diff --git a/test/registration/CMakeLists.txt b/test/registration/CMakeLists.txt index a865b1cccb2..ca268be1a58 100644 --- a/test/registration/CMakeLists.txt +++ b/test/registration/CMakeLists.txt @@ -10,7 +10,7 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS} OPT_DEPS ${OPT_DEPS if(build) PCL_ADD_TEST(registration_warp_api test_warps - FILES test_warps.cpp + FILES test_warps.cpp LINK_WITH pcl_gtest pcl_registration) PCL_ADD_TEST(correspondence_estimation test_correspondence_estimation diff --git a/test/segmentation/CMakeLists.txt b/test/segmentation/CMakeLists.txt index eb9ec1aff0a..2404c9ffd38 100644 --- a/test/segmentation/CMakeLists.txt +++ b/test/segmentation/CMakeLists.txt @@ -24,6 +24,6 @@ if(build) PCL_ADD_TEST(test_non_linear test_non_linear FILES test_non_linear.cpp - LINK_WITH pcl_gtest pcl_common pcl_io pcl_sample_consensus pcl_segmentation pcl_kdtree pcl_search + LINK_WITH pcl_gtest pcl_common pcl_io pcl_sample_consensus pcl_segmentation pcl_kdtree pcl_search ARGUMENTS "${PCL_SOURCE_DIR}/test/noisy_slice_displaced.pcd") endif() diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 8d0e6bd245d..28d96a01274 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -48,22 +48,22 @@ if(BUILD_tools) PCL_ADD_EXECUTABLE (pcl_vfh_estimation "${SUBSYS_NAME}" vfh_estimation.cpp) target_link_libraries (pcl_vfh_estimation pcl_common pcl_io pcl_features pcl_kdtree) - + PCL_ADD_EXECUTABLE (pcl_spin_estimation "${SUBSYS_NAME}" spin_estimation.cpp) target_link_libraries (pcl_spin_estimation pcl_common pcl_io pcl_features pcl_kdtree) PCL_ADD_EXECUTABLE (pcl_voxel_grid "${SUBSYS_NAME}" voxel_grid.cpp) target_link_libraries (pcl_voxel_grid pcl_common pcl_io pcl_filters) - + PCL_ADD_EXECUTABLE (pcl_passthrough_filter "${SUBSYS_NAME}" passthrough_filter.cpp) target_link_libraries (pcl_passthrough_filter pcl_common pcl_io pcl_filters) - + PCL_ADD_EXECUTABLE (pcl_radius_filter "${SUBSYS_NAME}" radius_filter.cpp) target_link_libraries (pcl_radius_filter pcl_common pcl_io pcl_filters) PCL_ADD_EXECUTABLE (pcl_extract_feature "${SUBSYS_NAME}" extract_feature.cpp) target_link_libraries (pcl_extract_feature pcl_common pcl_io pcl_features pcl_kdtree) - + PCL_ADD_EXECUTABLE (pcl_compute_cloud_error "${SUBSYS_NAME}" compute_cloud_error.cpp) target_link_libraries (pcl_compute_cloud_error pcl_common pcl_io pcl_kdtree pcl_search) @@ -81,19 +81,19 @@ if(BUILD_tools) PCL_ADD_EXECUTABLE (pcl_add_gaussian_noise "${SUBSYS_NAME}" add_gaussian_noise.cpp) target_link_libraries (pcl_add_gaussian_noise pcl_common pcl_io) endif() - + PCL_ADD_EXECUTABLE (pcl_outlier_removal "${SUBSYS_NAME}" outlier_removal.cpp) target_link_libraries (pcl_outlier_removal pcl_common pcl_io pcl_filters) - + PCL_ADD_EXECUTABLE (pcl_mls_smoothing "${SUBSYS_NAME}" mls_smoothing.cpp) target_link_libraries (pcl_mls_smoothing pcl_common pcl_io pcl_surface pcl_filters) - + PCL_ADD_EXECUTABLE (pcl_marching_cubes_reconstruction "${SUBSYS_NAME}" marching_cubes_reconstruction.cpp) target_link_libraries (pcl_marching_cubes_reconstruction pcl_common pcl_io pcl_surface) PCL_ADD_EXECUTABLE (pcl_gp3_surface "${SUBSYS_NAME}" gp3_surface.cpp) target_link_libraries (pcl_gp3_surface pcl_common pcl_io pcl_surface) - + PCL_ADD_EXECUTABLE(pcl_icp "${SUBSYS_NAME}" icp.cpp) target_link_libraries(pcl_icp pcl_common pcl_io pcl_registration) @@ -108,7 +108,7 @@ if(BUILD_tools) PCL_ADD_EXECUTABLE(pcl_ndt2d "${SUBSYS_NAME}" ndt2d.cpp) target_link_libraries(pcl_ndt2d pcl_common pcl_io pcl_registration) - + PCL_ADD_EXECUTABLE(pcl_ndt3d "${SUBSYS_NAME}" ndt3d.cpp) target_link_libraries(pcl_ndt3d pcl_common pcl_io pcl_registration) @@ -117,7 +117,7 @@ if(BUILD_tools) PCL_ADD_EXECUTABLE(pcl_concatenate_points_pcd "${SUBSYS_NAME}" concatenate_points_pcd.cpp) target_link_libraries(pcl_concatenate_points_pcd pcl_common pcl_io) - + PCL_ADD_EXECUTABLE(pcl_poisson_reconstruction "${SUBSYS_NAME}" poisson_reconstruction.cpp) target_link_libraries(pcl_poisson_reconstruction pcl_common pcl_io pcl_surface) @@ -129,7 +129,7 @@ if(BUILD_tools) PCL_ADD_EXECUTABLE(pcl_linemod_detection "${SUBSYS_NAME}" linemod_detection.cpp) target_link_libraries(pcl_linemod_detection pcl_common pcl_io pcl_recognition) - + PCL_ADD_EXECUTABLE(pcl_fast_bilateral_filter "${SUBSYS_NAME}" fast_bilateral_filter.cpp) target_link_libraries(pcl_fast_bilateral_filter pcl_common pcl_io pcl_filters) @@ -141,7 +141,7 @@ if(BUILD_tools) PCL_ADD_EXECUTABLE(pcl_morph "${SUBSYS_NAME}" morph.cpp) target_link_libraries(pcl_morph pcl_common pcl_io pcl_filters) - + PCL_ADD_EXECUTABLE(pcl_progressive_morphological_filter "${SUBSYS_NAME}" progressive_morphological_filter.cpp) target_link_libraries(pcl_progressive_morphological_filter pcl_common pcl_io pcl_filters pcl_segmentation) @@ -176,7 +176,7 @@ if(BUILD_tools) set(VTK_USE_FILE "${VTK_USE_FILE}" CACHE INTERNAL "VTK_USE_FILE") include("${VTK_USE_FILE}") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") - + PCL_ADD_EXECUTABLE(pcl_png2pcd "${SUBSYS_NAME}" png2pcd.cpp) target_link_libraries(pcl_png2pcd pcl_common pcl_io) @@ -188,7 +188,7 @@ if(BUILD_tools) PCL_ADD_EXECUTABLE(pcl_tiff2pcd "${SUBSYS_NAME}" tiff2pcd.cpp) target_link_libraries(pcl_tiff2pcd pcl_common pcl_io) - + PCL_ADD_EXECUTABLE(pcl_ply2vtk "${SUBSYS_NAME}" ply2vtk.cpp) target_link_libraries(pcl_ply2vtk pcl_common pcl_io) @@ -241,19 +241,19 @@ if(BUILD_tools) PCL_ADD_EXECUTABLE(pcl_mesh2pcd "${SUBSYS_NAME}" mesh2pcd.cpp) target_link_libraries(pcl_mesh2pcd pcl_common pcl_io pcl_visualization pcl_filters ${VTK_LIBRARIES}) - + PCL_ADD_EXECUTABLE(pcl_mesh_sampling "${SUBSYS_NAME}" mesh_sampling.cpp) target_link_libraries(pcl_mesh_sampling pcl_common pcl_io pcl_visualization pcl_filters ${VTK_LIBRARIES}) - + PCL_ADD_EXECUTABLE(pcl_virtual_scanner "${SUBSYS_NAME}" virtual_scanner.cpp) target_link_libraries(pcl_virtual_scanner pcl_common pcl_io pcl_filters pcl_visualization ${VTK_LIBRARIES}) PCL_ADD_EXECUTABLE (pcl_voxel_grid_occlusion_estimation "${SUBSYS_NAME}" voxel_grid_occlusion_estimation.cpp) target_link_libraries (pcl_voxel_grid_occlusion_estimation pcl_common pcl_io pcl_filters pcl_visualization) - + if(WITH_OPENNI) PCL_ADD_EXECUTABLE(pcl_openni_save_image "${SUBSYS_NAME}" openni_save_image.cpp) - target_link_libraries(pcl_openni_save_image pcl_common pcl_io pcl_visualization) + target_link_libraries(pcl_openni_save_image pcl_common pcl_io pcl_visualization) endif() endif() endif() @@ -272,6 +272,6 @@ if(BUILD_tools) target_link_libraries(pcl_video pcl_common pcl_io pcl_visualization ${Tide_LIBRARIES}) endif() - + endif() diff --git a/tracking/CMakeLists.txt b/tracking/CMakeLists.txt index aabf0104b21..71dfdfb317c 100644 --- a/tracking/CMakeLists.txt +++ b/tracking/CMakeLists.txt @@ -9,14 +9,14 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS}) PCL_ADD_DOC("${SUBSYS_NAME}") if(build) - set(srcs + set(srcs src/tracking.cpp src/particle_filter.cpp src/kld_adaptive_particle_filter.cpp src/coherence.cpp ) - set(incs + set(incs "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/tracking.h" "include/pcl/${SUBSYS_NAME}/tracker.h" @@ -33,7 +33,7 @@ if(build) "include/pcl/${SUBSYS_NAME}/pyramidal_klt.h" ) - set(impl_incs + set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/tracking.hpp" "include/pcl/${SUBSYS_NAME}/impl/tracker.hpp" "include/pcl/${SUBSYS_NAME}/impl/coherence.hpp" diff --git a/visualization/CMakeLists.txt b/visualization/CMakeLists.txt index 575eb562fcc..15d2ba0e530 100644 --- a/visualization/CMakeLists.txt +++ b/visualization/CMakeLists.txt @@ -56,7 +56,7 @@ if(build) # A custom interactor is necessary on VTK 5.4 and below list(APPEND srcs src/interactor.cpp) endif() - + if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" VERSION_GREATER "5.6") # PCLPainter2D uses some functions not present in vtk 5.6 list(APPEND srcs @@ -72,7 +72,7 @@ if(build) ) endif() - set(incs + set(incs "include/pcl/${SUBSYS_NAME}/eigen.h" "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/cloud_viewer.h" @@ -101,7 +101,7 @@ if(build) ) endif() - set(common_incs + set(common_incs "include/pcl/${SUBSYS_NAME}/common/actor_map.h" "include/pcl/${SUBSYS_NAME}/common/common.h" "include/pcl/${SUBSYS_NAME}/common/io.h" @@ -110,7 +110,7 @@ if(build) "include/pcl/${SUBSYS_NAME}/common/float_image_utils.h" ) - set(impl_incs + set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/histogram_visualizer.hpp" "include/pcl/${SUBSYS_NAME}/impl/pcl_visualizer.hpp" "include/pcl/${SUBSYS_NAME}/impl/image_viewer.hpp" @@ -129,7 +129,7 @@ if(build) set(common_impl_incs "include/pcl/${SUBSYS_NAME}/common/impl/shapes.hpp" "include/pcl/${SUBSYS_NAME}/common/impl/common.hpp") - set(vtk_incs + set(vtk_incs "include/pcl/${SUBSYS_NAME}/vtk/pcl_image_canvas_source_2d.h" "include/pcl/${SUBSYS_NAME}/vtk/pcl_context_item.h" "include/pcl/${SUBSYS_NAME}/vtk/vtkRenderWindowInteractorFix.h" @@ -157,7 +157,7 @@ if(build) if(APPLE) target_link_libraries("${LIB_NAME}" "-framework Cocoa") endif() - + if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" VERSION_LESS "5.6") target_link_libraries("${LIB_NAME}" pcl_common pcl_io pcl_kdtree vtkCommon vtkWidgets vtkHybrid vtkFiltering vtkRendering ${OPENGL_LIBRARIES}) else() @@ -196,7 +196,7 @@ if(build) if(BUILD_TESTS) add_subdirectory(test) endif() - + if(BUILD_tools) add_subdirectory(tools) endif() diff --git a/visualization/tools/CMakeLists.txt b/visualization/tools/CMakeLists.txt index 2b515f58d49..960cc69d905 100644 --- a/visualization/tools/CMakeLists.txt +++ b/visualization/tools/CMakeLists.txt @@ -3,7 +3,7 @@ target_link_libraries(pcl_viewer pcl_common pcl_io pcl_kdtree pcl_visualization PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_pcd_image_viewer ${SUBSYS_NAME} image_viewer.cpp) target_link_libraries(pcl_pcd_image_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) - + PCL_ADD_EXECUTABLE(pcl_timed_trigger_test ${SUBSYS_NAME} timed_trigger_test.cpp) target_link_libraries(pcl_timed_trigger_test pcl_io pcl_common pcl_kdtree pcl_visualization) @@ -17,13 +17,13 @@ if(WITH_OPENNI) PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_pcd_grabber_viewer ${SUBSYS_NAME} pcd_grabber_viewer.cpp) target_link_libraries(pcl_pcd_grabber_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) - + PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_image_grabber_saver ${SUBSYS_NAME} image_grabber_saver.cpp) target_link_libraries(pcl_image_grabber_saver pcl_common pcl_io pcl_kdtree pcl_visualization) PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_image_grabber_viewer ${SUBSYS_NAME} image_grabber_viewer.cpp) target_link_libraries(pcl_image_grabber_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) - + #PCL_ADD_EXECUTABLE(pcl_openni_viewer_simple ${SUBSYS_NAME} openni_viewer_simple.cpp) #target_link_libraries(pcl_openni_viewer_simple pcl_common pcl_io pcl_kdtree pcl_visualization)