]>
Commit | Line | Data |
---|---|---|
608cf0e6 AM |
1 | --- pcl-pcl-1.7.2/./PCLConfig.cmake.in~ 2014-09-10 23:22:57.000000000 +0200 |
2 | +++ pcl-pcl-1.7.2/./PCLConfig.cmake.in 2014-11-11 11:37:12.494124290 +0100 | |
3 | @@ -182,13 +182,13 @@ macro(find_openni) | |
4 | endif(NOT OPENNI_ROOT AND ("@HAVE_OPENNI@" STREQUAL "ON")) | |
5 | ||
6 | if(PKG_CONFIG_FOUND) | |
7 | - pkg_check_modules(PC_OPENNI openni-dev) | |
8 | + pkg_check_modules(PC_OPENNI libopenni) | |
9 | endif(PKG_CONFIG_FOUND) | |
10 | find_path(OPENNI_INCLUDE_DIRS XnStatus.h | |
11 | HINTS ${PC_OPENNI_INCLUDEDIR} ${PC_OPENNI_INCLUDE_DIRS} | |
12 | "${OPENNI_ROOT}" "$ENV{OPENNI_ROOT}" | |
13 | PATHS "$ENV{OPEN_NI_INCLUDE}" "${OPENNI_INCLUDE_DIRS_HINT}" | |
14 | - PATH_SUFFIXES include/openni Include) | |
15 | + PATH_SUFFIXES include/openni include/ni Include) | |
16 | #add a hint so that it can find it without the pkg-config | |
17 | set(OPENNI_SUFFIX) | |
18 | if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8) | |
19 | @@ -222,7 +222,7 @@ macro(find_openni2) | |
20 | endif(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8) | |
21 | ||
22 | if(PKG_CONFIG_FOUND) | |
23 | - pkg_check_modules(PC_OPENNI2 openni2-dev) | |
24 | + pkg_check_modules(PC_OPENNI2 libopenni2) | |
25 | endif(PKG_CONFIG_FOUND) | |
26 | ||
27 | find_path(OPENNI2_INCLUDE_DIRS OpenNI.h | |
28 | --- pcl-pcl-1.7.2/./cmake/Modules/FindOpenNI.cmake~ 2014-09-10 23:22:57.000000000 +0200 | |
29 | +++ pcl-pcl-1.7.2/./cmake/Modules/FindOpenNI.cmake 2014-11-11 11:37:58.671931739 +0100 | |
30 | @@ -35,9 +35,9 @@ if(NOT WIN32) | |
31 | endif(NOT WIN32) | |
32 | ||
33 | if(${CMAKE_VERSION} VERSION_LESS 2.8.2) | |
34 | - pkg_check_modules(PC_OPENNI openni-dev) | |
35 | + pkg_check_modules(PC_OPENNI libopenni) | |
36 | else() | |
37 | - pkg_check_modules(PC_OPENNI QUIET openni-dev) | |
38 | + pkg_check_modules(PC_OPENNI QUIET libopenni) | |
39 | endif() | |
40 | ||
41 | set(OPENNI_DEFINITIONS ${PC_OPENNI_CFLAGS_OTHER}) | |
42 | --- pcl-pcl-1.7.2/./io/CMakeLists.txt~ 2014-09-10 23:22:57.000000000 +0200 | |
43 | +++ pcl-pcl-1.7.2/./io/CMakeLists.txt 2014-11-11 11:38:42.636351255 +0100 | |
44 | @@ -329,10 +329,10 @@ if(build) | |
45 | set(EXT_DEPS eigen3) | |
46 | ||
47 | if(OPENNI_FOUND) | |
48 | - list(APPEND EXT_DEPS openni-dev) | |
49 | + list(APPEND EXT_DEPS libopenni) | |
50 | endif(OPENNI_FOUND) | |
51 | if(OPENNI2_FOUND) | |
52 | - list(APPEND EXT_DEPS openni2-dev) | |
53 | + list(APPEND EXT_DEPS libopenni2) | |
54 | endif(OPENNI2_FOUND) | |
55 | ||
56 | PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" | |
57 | --- pcl-pcl-1.7.2/./visualization/CMakeLists.txt~ 2014-09-10 23:22:57.000000000 +0200 | |
58 | +++ pcl-pcl-1.7.2/./visualization/CMakeLists.txt 2014-11-11 11:39:19.057251297 +0100 | |
59 | @@ -154,10 +154,10 @@ if(build) | |
60 | ||
61 | set(EXT_DEPS "") | |
62 | if(OPENNI_FOUND) | |
63 | - list(APPEND EXT_DEPS openni-dev) | |
64 | + list(APPEND EXT_DEPS libopenni) | |
65 | endif(OPENNI_FOUND) | |
66 | if(OPENNI2_FOUND) | |
67 | - list(APPEND EXT_DEPS openni2-dev) | |
68 | + list(APPEND EXT_DEPS libopenni2) | |
69 | endif(OPENNI2_FOUND) | |
70 | PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" | |
71 | "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "") |