From 10d42e9f4444475c7adff866d2a8ff9459b2632d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20S=C3=A4lzle?= Date: Tue, 15 Jan 2013 23:34:28 +0000 Subject: [PATCH] added pcl_geometry to the header only libraries again git-svn-id: svn+ssh://svn.pointclouds.org/pcl/trunk@8513 a9d63959-f2ad-4865-b262-bf0e56cfafb6 --- PCLConfig.cmake.in | 2 +- geometry/CMakeLists.txt | 15 ++++++++------- geometry/src/geometry.cpp | 38 -------------------------------------- 3 files changed, 9 insertions(+), 46 deletions(-) delete mode 100644 geometry/src/geometry.cpp diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in index e04e396eae5..b254230d333 100644 --- a/PCLConfig.cmake.in +++ b/PCLConfig.cmake.in @@ -432,7 +432,7 @@ list(LENGTH pcl_all_components PCL_NB_COMPONENTS) @PCLCONFIG_OPTIONAL_DEPENDENCIES@ -set(pcl_header_only_components 2d cuda_common gpu_tracking modeler in_hand_scanner) +set(pcl_header_only_components 2d cuda_common geometry gpu_tracking modeler in_hand_scanner) include(FindPackageHandleStandardArgs) diff --git a/geometry/CMakeLists.txt b/geometry/CMakeLists.txt index e8dc75fe590..7bb3ee1c78b 100644 --- a/geometry/CMakeLists.txt +++ b/geometry/CMakeLists.txt @@ -32,15 +32,16 @@ if(build) include/pcl/${SUBSYS_NAME}/impl/polygon_operations.hpp ) - set(srcs - src/geometry.cpp - ) +# set(srcs +# src/geometry.cpp +# ) - set(LIB_NAME pcl_${SUBSYS_NAME}) +# set(LIB_NAME pcl_${SUBSYS_NAME}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) - PCL_ADD_LIBRARY(${LIB_NAME} ${SUBSYS_NAME} ${srcs} ${incs} ${impl_incs}) - target_link_libraries(${LIB_NAME} pcl_common) - PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "") +# PCL_ADD_LIBRARY(${LIB_NAME} ${SUBSYS_NAME} ${srcs} ${incs} ${impl_incs}) +# target_link_libraries(${LIB_NAME} pcl_common) +# 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/geometry/src/geometry.cpp b/geometry/src/geometry.cpp deleted file mode 100644 index 66ee75634fb..00000000000 --- a/geometry/src/geometry.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Software License Agreement (BSD License) - * - * Point Cloud Library (PCL) - www.pointclouds.org - * Copyright (c) 2012-, Open Perception, Inc. - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the copyright holder(s) nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ -#include -