diff -urN PCL-1.3.1-Source/cmake/pcl_targets.cmake PCL-1.3.1-Source.fedora/cmake/pcl_targets.cmake

--- PCL-1.3.1-Source/cmake/pcl_targets.cmake	2011-12-03 00:35:48.000000000 +0100

+++ PCL-1.3.1-Source.fedora/cmake/pcl_targets.cmake	2012-01-16 19:40:43.433690172 +0100

@@ -1,5 +1,7 @@

 include(${PROJECT_SOURCE_DIR}/cmake/pcl_utils.cmake)

+set(PCL_PKGCONFIG_SUFFIX "-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}" CACHE STRING "Suffix to append to pkg-config files")

+

 ###############################################################################

 # Add an option to build a subsystem or not.

 # _var The name of the variable to store the option in.

@@ -331,14 +333,14 @@

     LIST_TO_STRING(_ext_deps_str "${_ext_deps}")

     set(PKG_EXTERNAL_DEPS ${_ext_deps_str})

     foreach(_dep ${_pcl_deps})

-      set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} pcl_${_dep}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")

+      set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} pcl_${_dep}${PCL_PKGCONFIG_SUFFIX}")

     endforeach(_dep)

     set(PKG_INTERNAL_DEPS "")

     foreach(_dep ${_int_deps})

         set(PKG_INTERNAL_DEPS "${PKG_INTERNAL_DEPS} -l${_dep}")

     endforeach(_dep)

-    set(_pc_file ${CMAKE_CURRENT_BINARY_DIR}/${_name}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}.pc)

+    set(_pc_file ${CMAKE_CURRENT_BINARY_DIR}/${_name}${PCL_PKGCONFIG_SUFFIX}.pc)

     configure_file(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake.in ${_pc_file}

         @ONLY)

     install(FILES ${_pc_file} DESTINATION ${PKGCFG_INSTALL_DIR}

diff -urN PCL-1.3.1-Source/cmake/pcl_utils.cmake PCL-1.3.1-Source.fedora/cmake/pcl_utils.cmake

--- PCL-1.3.1-Source/cmake/pcl_utils.cmake	2011-12-03 00:35:48.000000000 +0100

+++ PCL-1.3.1-Source.fedora/cmake/pcl_utils.cmake	2012-01-16 19:40:43.434690169 +0100

@@ -81,7 +81,7 @@

 # subdirectory named after the library in question (e.g.

 # "registration/blorgle.h")

 macro(SET_INSTALL_DIRS)

-    set(LIB_INSTALL_DIR "lib")

+    set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")

     set(INCLUDE_INSTALL_ROOT

         "include/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")

     set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl")

diff -urN PCL-1.3.1-Source/CMakeLists.txt PCL-1.3.1-Source.fedora/CMakeLists.txt

--- PCL-1.3.1-Source/CMakeLists.txt	2011-12-03 00:35:48.000000000 +0100

+++ PCL-1.3.1-Source.fedora/CMakeLists.txt	2012-01-16 19:40:43.435690166 +0100

@@ -96,11 +96,11 @@

 ###

 SET(CMAKE_SKIP_BUILD_RPATH  FALSE)

 SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 

-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")

+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")

 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" is_system_dir)

+LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" is_system_dir)

 IF("${is_system_dir}" STREQUAL "-1")

-   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")

+   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")

 ENDIF("${is_system_dir}" STREQUAL "-1")

 ### ---[ Find universal dependencies

diff -urN PCL-1.3.1-Source/io/CMakeLists.txt PCL-1.3.1-Source.fedora/io/CMakeLists.txt

--- PCL-1.3.1-Source/io/CMakeLists.txt	2011-12-03 00:35:48.000000000 +0100

+++ PCL-1.3.1-Source.fedora/io/CMakeLists.txt	2012-01-16 19:40:43.436690163 +0100

@@ -112,9 +112,10 @@

     endif(OPENNI_FOUND)

     set(EXT_DEPS eigen3)

-    if(OPENNI_FOUND)

-      list(APPEND EXT_DEPS openni-dev)

-    endif(OPENNI_FOUND)

+    # Disable on Fedora, there is no pkg-config file

+    #if(OPENNI_FOUND)

+    #  list(APPEND EXT_DEPS openni-dev)

+    #endif(OPENNI_FOUND)

     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"

       "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")

diff -urN PCL-1.3.1-Source/PCLConfig.cmake.in PCL-1.3.1-Source.fedora/PCLConfig.cmake.in

--- PCL-1.3.1-Source/PCLConfig.cmake.in	2011-12-03 00:35:48.000000000 +0100

+++ PCL-1.3.1-Source.fedora/PCLConfig.cmake.in	2012-01-16 19:47:07.404643739 +0100

@@ -304,9 +304,13 @@

 # PCLConfig.cmake is installed to PCL_ROOT/cmake

   get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)

 else(WIN32)

-# PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y

+  # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y or PCL_ROOT/lib${LIB_SUFFIX}/cmake/pcl

   get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)

   get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)

+  if (${PCL_DIR} MATCHES ".*lib.*")

+    # PCLConfig.cmake is installed to PCL_ROOT/lib${LIB_SUFFIX}/cmake/pcl

+    get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)

+  endif()

 endif(WIN32)

 # check whether PCLConfig.cmake is found into a PCL installation or in a build tree

diff -urN PCL-1.3.1-Source/visualization/CMakeLists.txt PCL-1.3.1-Source.fedora/visualization/CMakeLists.txt

--- PCL-1.3.1-Source/visualization/CMakeLists.txt	2011-12-03 00:35:48.000000000 +0100

+++ PCL-1.3.1-Source.fedora/visualization/CMakeLists.txt	2012-01-16 19:40:43.437690160 +0100

@@ -81,9 +81,9 @@

      target_link_libraries(${LIB_NAME} pcl_io pcl_kdtree pcl_range_image 

                                        vtkCommon vtkWidgets vtkHybrid)

     set(EXT_DEPS "")

-    if(OPENNI_FOUND)

-      list(APPEND EXT_DEPS openni-dev)

-    endif(OPENNI_FOUND)

+    #if(OPENNI_FOUND)

+    #  list(APPEND EXT_DEPS openni-dev)

+    #endif(OPENNI_FOUND)

     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"

       "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")