Skip to content

Commit 61df5d2

Browse files
committed
remove a few old patches
1 parent d43cd6e commit 61df5d2

File tree

1 file changed

+1
-24
lines changed

1 file changed

+1
-24
lines changed

CMakeLists.txt

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -317,25 +317,8 @@ endif()
317317
# Threads (required)
318318
find_package(Threads REQUIRED)
319319

320-
# Eigen (required)
321-
# PATCH: Build system needs to pass PC_EIGEN_INCLUDE_DIRS variable to make it search-able
322-
if(NOT DEFINED PC_EIGEN_INCLUDE_DIRS)
323-
message(FATAL_ERROR "PATCH: PC_EIGEN_INCLUDE_DIRS is required!")
324-
endif()
325-
326320
find_package(Eigen 3.3 REQUIRED)
327321
include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
328-
329-
# FLANN (required)
330-
# PATCH: manually set flann.pc variables and make it work with build system
331-
if(NOT DEFINED _PATCHED_FLANN_INSTALL_DIR_)
332-
message(FATAL_ERROR "PATCH: _PATCHED_FLANN_INSTALL_DIR_ is required!")
333-
endif()
334-
set(FLANN_FOUND 1)
335-
set(FLANN_INCLUDE_DIRS ${_PATCHED_FLANN_INSTALL_DIR_}/include)
336-
set(FLANN_LIBRARY_DIRS ${_PATCHED_FLANN_INSTALL_DIR_}/lib)
337-
set(FLANN_LIBRARIES ${FLANN_LIBRARY_DIRS}/flann_cpp_s.lib)
338-
339322
include_directories(${FLANN_INCLUDE_DIRS})
340323

341324
# Create interface library that effectively becomes an alias for the appropriate (static/dynamic) imported FLANN target
@@ -427,12 +410,6 @@ if(WITH_OPENGL)
427410
include("${PCL_SOURCE_DIR}/cmake/pcl_find_gl.cmake")
428411
endif()
429412

430-
# Boost (required)
431-
# PATCH: Build system needs to pass Boost_DIR variable to make it search-able
432-
if(NOT DEFINED Boost_DIR)
433-
message(FATAL_ERROR "PATCH: Boost_DIR is required!")
434-
endif()
435-
436413
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
437414
include("${PCL_SOURCE_DIR}/cmake/pcl_find_boost.cmake")
438415
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG FALSE)
@@ -474,4 +451,4 @@ MAKE_DEP_GRAPH()
474451

475452
### ---[ Finish up
476453
PCL_WRITE_STATUS_REPORT()
477-
PCL_RESET_MAPS()
454+
PCL_RESET_MAPS()

0 commit comments

Comments
 (0)