syncing trunk to pcl-1.x and pcl-1.1.x ( /, cmake/, apps)

git-svn-id: svn+ssh://svn.pointclouds.org/pcl/branches/pcl-1.1.x@2318 a9d63959-f2ad-4865-b262-bf0e56cfafb6
PointCloudLibrary · Aug 30, 2011 · 8fa3866 · 8fa3866
1 parent 2fd91b0
commit 8fa3866
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,6 +9,7 @@ endif("${CMAKE_BUILD_TYPE}" STREQUAL "")
 project(PCL)
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
 
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
     "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
@@ -39,7 +40,7 @@ else(UNIX OR APPLE)
   endif(MSVC)
 endif()
 if (__COMPILER_PATHSCALE)
-  add_definitions("-Wno-uninitialized -zerouv -pthread")
+  add_definitions("-Wno-uninitialized -zerouv -pthread -mp")
 endif()
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
   add_definitions("-std=gnu++0x")
@@ -123,6 +124,7 @@ include(${PCL_SOURCE_DIR}/cmake/pcl_find_ros.cmake)
 find_package(VTK)
 if(VTK_FOUND)
   message(STATUS "VTK found (include: ${VTK_INCLUDE_DIRS}, lib: ${VTK_LIBRARY_DIRS})")
+  link_directories(${VTK_LIBRARY_DIRS})
   set(HAVE_VTK ON)
 endif()
 # Find wxWidgets

diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,6 @@
 Software License Agreement (BSD License)
 
+Point Cloud Library (PCL) - www.pointclouds.org
 Copyright (c) 2009-2011, Willow Garage, Inc.
 Copyright (c) XXX, respective authors.
 

diff --git a/apps/src/openni_3d_concave_hull.cpp b/apps/src/openni_3d_concave_hull.cpp
@@ -45,6 +45,7 @@
 #include <pcl/surface/concave_hull.h>
 #include <pcl/console/parse.h>
 #include <pcl/common/time.h>
+#include <pcl/visualization/cloud_viewer.h>
 
 using namespace pcl;
 using namespace pcl::visualization;

diff --git a/apps/src/openni_ii_normal_estimation.cpp b/apps/src/openni_ii_normal_estimation.cpp
@@ -39,11 +39,11 @@
 #include <pcl/point_types.h>
 #include <pcl/io/openni_grabber.h>
 #include <pcl/io/pcd_io.h>
-#include <pcl/visualization/cloud_viewer.h>
 #include <pcl/io/openni_camera/openni_driver.h>
 #include <pcl/features/integral_image_normal.h>
 #include <pcl/console/parse.h>
 #include <pcl/common/time.h>
+#include <pcl/visualization/cloud_viewer.h>
 
 #define FPS_CALC(_WHAT_) \
 do \

diff --git a/apps/src/openni_voxel_grid.cpp b/apps/src/openni_voxel_grid.cpp
@@ -164,9 +164,7 @@ usage (char ** argv)
 int 
 main (int argc, char ** argv)
 {
-  bool help = false;
-  pcl::console::parse_argument (argc, argv, "-h", help);
-  if (help)
+  if (pcl::console::find_argument (argc, argv, "-h"))
   {
     usage (argv);
     return (1);

diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake
@@ -81,6 +81,8 @@ macro(PCL_ADD_LIBRARY _name _component)
       set_target_properties(${_name} PROPERTIES LINK_FLAGS_RELEASE /OPT:REF)
     elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
       set_target_properties(${_name} PROPERTIES LINK_FLAGS -Wl)
+    elseif(__COMPILER_PATHSCALE)
+      set_target_properties(${_name} PROPERTIES LINK_FLAGS -mp)
     else()
       set_target_properties(${_name} PROPERTIES LINK_FLAGS -Wl,--as-needed)
     endif()
@@ -109,9 +111,9 @@ endmacro(PCL_ADD_LIBRARY)
 macro(PCL_CUDA_ADD_LIBRARY _name _component)
     if(PCL_SHARED_LIBS)
         # to overcome a limitation in cuda_add_library, we add manually PCLAPI_EXPORTS macro
-        cuda_add_library(${_name} ${PCL_LIB_TYPE} ${ARGN} OPTIONS -arch sm_20 -DPCLAPI_EXPORTS)
+        cuda_add_library(${_name} ${PCL_LIB_TYPE} ${ARGN} OPTIONS -DPCLAPI_EXPORTS)
     else(PCL_SHARED_LIBS)
-        cuda_add_library(${_name} ${PCL_LIB_TYPE} ${ARGN} OPTIONS -arch sm_20)
+        cuda_add_library(${_name} ${PCL_LIB_TYPE} ${ARGN})
     endif(PCL_SHARED_LIBS)
 
     # must link explicitly against boost.
@@ -161,6 +163,8 @@ macro(PCL_ADD_EXECUTABLE _name _component)
       set_target_properties(${_name} PROPERTIES LINK_FLAGS_RELEASE /OPT:REF DEBUG_OUTPUT_NAME ${_name}${CMAKE_DEBUG_POSTFIX})
     elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
       set_target_properties(${_name} PROPERTIES LINK_FLAGS -Wl)
+    elseif(__COMPILER_PATHSCALE)
+      set_target_properties(${_name} PROPERTIES LINK_FLAGS -mp)
     else()
       set_target_properties(${_name} PROPERTIES LINK_FLAGS -Wl,--as-needed)
     endif()