Skip to content

Commit 4c08990

Browse files
kunaltyagikunaltyagi
authored
Merge pull request #5071 from mvieth/release_qhull_debug
2 parents bc3032e + 2cfbdb0 commit 4c08990

File tree

4 files changed

+35
-32
lines changed

4 files changed

+35
-32
lines changed

‎.dev/docker/perception_pcl_ros/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ COPY package.xml ${workspace}/src/pcl/
3535
RUN cd ${workspace} \
3636
&& . "/opt/ros/${flavor}/setup.sh" \
3737
&& catkin config --install --link-devel \
38-
&& catkin build -j2 libpcl-all-dev --cmake-args -DWITH_OPENGL:BOOL=OFF \
38+
&& catkin build --no-status --verbose --summary -j2 libpcl-all-dev --cmake-args -DWITH_OPENGL:BOOL=OFF \
3939
&& rm -fr build/libpcl-all-dev \
40-
&& catkin build --start-with pcl_msgs
40+
&& catkin build --no-status --verbose --summary --start-with pcl_msgs

‎PCLConfig.cmake.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ macro(find_qhull)
129129
get_filename_component(QHULL_ROOT "@QHULL_INCLUDE_DIRS@" PATH)
130130
endif()
131131

132-
set(QHULL_USE_STATIC @QHULL_USE_STATIC@)
132+
set(PCL_QHULL_REQUIRED_TYPE @PCL_QHULL_REQUIRED_TYPE@)
133133
find_package(Qhull)
134134
endmacro()
135135

@@ -227,7 +227,7 @@ macro(find_flann)
227227
set(FLANN_ROOT "@FLANN_ROOT@")
228228
endif()
229229

230-
set(FLANN_USE_STATIC @FLANN_USE_STATIC@)
230+
set(PCL_FLANN_REQUIRED_TYPE @PCL_FLANN_REQUIRED_TYPE@)
231231
find_package(FLANN)
232232
endmacro()
233233

@@ -420,6 +420,8 @@ set(PCL_INCLUDE_DIRS "${PCL_CONF_INCLUDE_DIR}")
420420
set(PCL_DEBUG_SUFFIX "@CMAKE_DEBUG_POSTFIX@")
421421
set(PCL_RELEASE_SUFFIX "@CMAKE_RELEASE_POSTFIX@")
422422

423+
set(PCL_SHARED_LIBS "@PCL_SHARED_LIBS@")
424+
423425
#set SSE flags used compiling PCL
424426
list(APPEND PCL_DEFINITIONS @PCLCONFIG_SSE_DEFINITIONS@)
425427
list(APPEND PCL_COMPILE_OPTIONS @PCLCONFIG_SSE_COMPILE_OPTIONS@)

‎cmake/Modules/FindFLANN.cmake

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ if(flann_FOUND)
5151
add_library(FLANN::FLANN INTERFACE IMPORTED)
5252

5353
if(TARGET flann::flann_cpp_s AND TARGET flann::flann_cpp)
54-
if(PCL_FLANN_REQUIRED_TYPE MATCHES "DONTCARE")
54+
if(PCL_FLANN_REQUIRED_TYPE MATCHES "SHARED")
55+
set_property(TARGET FLANN::FLANN APPEND PROPERTY INTERFACE_LINK_LIBRARIES flann::flann_cpp)
56+
set(FLANN_LIBRARY_TYPE SHARED)
57+
elseif(PCL_FLANN_REQUIRED_TYPE MATCHES "STATIC")
58+
set_property(TARGET FLANN::FLANN APPEND PROPERTY INTERFACE_LINK_LIBRARIES flann::flann_cpp_s)
59+
set(FLANN_LIBRARY_TYPE STATIC)
60+
else()
5561
if(PCL_SHARED_LIBS)
5662
set_property(TARGET FLANN::FLANN APPEND PROPERTY INTERFACE_LINK_LIBRARIES flann::flann_cpp)
5763
set(FLANN_LIBRARY_TYPE SHARED)
5864
else()
5965
set_property(TARGET FLANN::FLANN APPEND PROPERTY INTERFACE_LINK_LIBRARIES flann::flann_cpp_s)
6066
set(FLANN_LIBRARY_TYPE STATIC)
6167
endif()
62-
elseif(PCL_FLANN_REQUIRED_TYPE MATCHES "SHARED")
63-
set_property(TARGET FLANN::FLANN APPEND PROPERTY INTERFACE_LINK_LIBRARIES flann::flann_cpp)
64-
set(FLANN_LIBRARY_TYPE SHARED)
65-
else()
66-
set_property(TARGET FLANN::FLANN APPEND PROPERTY INTERFACE_LINK_LIBRARIES flann::flann_cpp_s)
67-
set(FLANN_LIBRARY_TYPE STATIC)
6868
endif()
6969
elseif(TARGET flann::flann_cpp_s)
7070
set_property(TARGET FLANN::FLANN APPEND PROPERTY INTERFACE_LINK_LIBRARIES flann::flann_cpp_s)
@@ -161,20 +161,20 @@ find_library(FLANN_LIBRARY_DEBUG_STATIC
161161
)
162162

163163
if(FLANN_LIBRARY_SHARED AND FLANN_LIBRARY_STATIC)
164-
if(PCL_FLANN_REQUIRED_TYPE MATCHES "DONTCARE")
164+
if(PCL_FLANN_REQUIRED_TYPE MATCHES "SHARED")
165+
set(FLANN_LIBRARY_TYPE SHARED)
166+
set(FLANN_LIBRARY ${FLANN_LIBRARY_SHARED})
167+
elseif(PCL_FLANN_REQUIRED_TYPE MATCHES "STATIC")
168+
set(FLANN_LIBRARY_TYPE STATIC)
169+
set(FLANN_LIBRARY ${FLANN_LIBRARY_STATIC})
170+
else()
165171
if(PCL_SHARED_LIBS)
166172
set(FLANN_LIBRARY_TYPE SHARED)
167173
set(FLANN_LIBRARY ${FLANN_LIBRARY_SHARED})
168174
else()
169175
set(FLANN_LIBRARY_TYPE STATIC)
170176
set(FLANN_LIBRARY ${FLANN_LIBRARY_STATIC})
171177
endif()
172-
elseif(PCL_FLANN_REQUIRED_TYPE MATCHES "SHARED")
173-
set(FLANN_LIBRARY_TYPE SHARED)
174-
set(FLANN_LIBRARY ${FLANN_LIBRARY_SHARED})
175-
else()
176-
set(FLANN_LIBRARY_TYPE STATIC)
177-
set(FLANN_LIBRARY ${FLANN_LIBRARY_STATIC})
178178
endif()
179179
elseif(FLANN_LIBRARY_STATIC)
180180
set(FLANN_LIBRARY_TYPE STATIC)
@@ -218,4 +218,5 @@ if(FLANN_FOUND)
218218
endif()
219219
endforeach()
220220
get_filename_component(FLANN_ROOT "${FLANN_INCLUDE_DIR}" PATH)
221+
message(STATUS "FLANN found (include: ${FLANN_INCLUDE_DIR}, lib: ${FLANN_LIBRARY})")
221222
endif()

‎cmake/Modules/FindQhull.cmake

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,20 @@ if(Qhull_FOUND)
5555
add_library(QHULL::QHULL INTERFACE IMPORTED)
5656

5757
if(TARGET Qhull::qhull_r AND TARGET Qhull::qhullstatic_r)
58-
if(PCL_QHULL_REQUIRED_TYPE MATCHES "DONTCARE")
58+
if(PCL_QHULL_REQUIRED_TYPE MATCHES "SHARED")
59+
set_property(TARGET QHULL::QHULL APPEND PROPERTY INTERFACE_LINK_LIBRARIES Qhull::qhull_r)
60+
set(QHULL_LIBRARY_TYPE SHARED)
61+
elseif(PCL_QHULL_REQUIRED_TYPE MATCHES "STATIC")
62+
set_property(TARGET QHULL::QHULL APPEND PROPERTY INTERFACE_LINK_LIBRARIES Qhull::qhullstatic_r)
63+
set(QHULL_LIBRARY_TYPE STATIC)
64+
else()
5965
if(PCL_SHARED_LIBS)
6066
set_property(TARGET QHULL::QHULL APPEND PROPERTY INTERFACE_LINK_LIBRARIES Qhull::qhull_r)
6167
set(QHULL_LIBRARY_TYPE SHARED)
6268
else()
6369
set_property(TARGET QHULL::QHULL APPEND PROPERTY INTERFACE_LINK_LIBRARIES Qhull::qhullstatic_r)
6470
set(QHULL_LIBRARY_TYPE STATIC)
6571
endif()
66-
elseif(PCL_QHULL_REQUIRED_TYPE MATCHES "SHARED")
67-
set_property(TARGET QHULL::QHULL APPEND PROPERTY INTERFACE_LINK_LIBRARIES Qhull::qhull_r)
68-
set(QHULL_LIBRARY_TYPE SHARED)
69-
else()
70-
set_property(TARGET QHULL::QHULL APPEND PROPERTY INTERFACE_LINK_LIBRARIES Qhull::qhullstatic_r)
71-
set(QHULL_LIBRARY_TYPE STATIC)
7272
endif()
7373
elseif(TARGET Qhull::qhullstatic_r)
7474
set_property(TARGET QHULL::QHULL APPEND PROPERTY INTERFACE_LINK_LIBRARIES Qhull::qhullstatic_r)
@@ -126,20 +126,20 @@ find_library(QHULL_LIBRARY_DEBUG_STATIC
126126
PATH_SUFFIXES project build bin lib debug/lib)
127127

128128
if(QHULL_LIBRARY_SHARED AND QHULL_LIBRARY_STATIC)
129-
if(PCL_QHULL_REQUIRED_TYPE MATCHES "DONTCARE")
129+
if(PCL_QHULL_REQUIRED_TYPE MATCHES "SHARED")
130+
set(QHULL_LIBRARY_TYPE SHARED)
131+
set(QHULL_LIBRARY ${QHULL_LIBRARY_SHARED})
132+
elseif(PCL_QHULL_REQUIRED_TYPE MATCHES "STATIC")
133+
set(QHULL_LIBRARY_TYPE STATIC)
134+
set(QHULL_LIBRARY ${QHULL_LIBRARY_STATIC})
135+
else()
130136
if(PCL_SHARED_LIBS)
131137
set(QHULL_LIBRARY_TYPE SHARED)
132138
set(QHULL_LIBRARY ${QHULL_LIBRARY_SHARED})
133139
else()
134140
set(QHULL_LIBRARY_TYPE STATIC)
135141
set(QHULL_LIBRARY ${QHULL_LIBRARY_STATIC})
136142
endif()
137-
elseif(PCL_QHULL_REQUIRED_TYPE MATCHES "SHARED")
138-
set(QHULL_LIBRARY_TYPE SHARED)
139-
set(QHULL_LIBRARY ${QHULL_LIBRARY_SHARED})
140-
else()
141-
set(QHULL_LIBRARY_TYPE STATIC)
142-
set(QHULL_LIBRARY ${QHULL_LIBRARY_STATIC})
143143
endif()
144144
elseif(QHULL_LIBRARY_STATIC)
145145
set(QHULL_LIBRARY_TYPE STATIC)

0 commit comments

Comments
 (0)