Make Boost filesystem optional for C++17 (#5937)

* Make Boost filesystem optional for C++17

* Add more changes

* Simpler changes

* Review changes

Author: cybaol

apps/3d_rec_framework/CMakeLists.txt

@@ -3,6 +3,13 @@ set(SUBSUBSYS_DESC "3D recognition framework")
 set(SUBSUBSYS_DEPS common geometry io filters sample_consensus segmentation visualization kdtree features surface octree registration keypoints tracking search recognition ml)
 set(SUBSUBSYS_EXT_DEPS vtk openni)
 
+if(NOT TARGET Boost::filesystem)
+  set(DEFAULT FALSE)
+  set(REASON "Boost filesystem is not available.")
+else()
+  set(DEFAULT TRUE)
+endif()
+
 # Default to not building for now
 if(${DEFAULT} STREQUAL "TRUE")
   set(DEFAULT FALSE)

cmake/pcl_find_boost.cmake

@@ -19,16 +19,25 @@ set(Boost_ADDITIONAL_VERSIONS
   "1.74.0" "1.74" "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70"
   "1.69.0" "1.69" "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65")
 
-# Optional boost modules
-find_package(Boost 1.65.0 QUIET COMPONENTS serialization mpi)
-if(Boost_SERIALIZATION_FOUND)
-  set(BOOST_SERIALIZATION_FOUND TRUE)
+if(CMAKE_CXX_STANDARD MATCHES "14")
+  # Optional boost modules
+  set(BOOST_OPTIONAL_MODULES serialization mpi)
+  # Required boost modules
+  set(BOOST_REQUIRED_MODULES filesystem iostreams system)
+else()
+  # Optional boost modules
+  set(BOOST_OPTIONAL_MODULES filesystem serialization mpi)
+  # Required boost modules
+  set(BOOST_REQUIRED_MODULES iostreams system)
 endif()
 
-# Required boost modules
-set(BOOST_REQUIRED_MODULES filesystem iostreams system)
+find_package(Boost 1.65.0 QUIET COMPONENTS ${BOOST_OPTIONAL_MODULES})
 find_package(Boost 1.65.0 REQUIRED COMPONENTS ${BOOST_REQUIRED_MODULES})
 
+if(Boost_SERIALIZATION_FOUND)
+  set(BOOST_SERIALIZATION_FOUND TRUE)
+endif()
+
 if(Boost_FOUND)
   set(BOOST_FOUND TRUE)
 endif()

cmake/pcl_pclconfig.cmake

@@ -85,7 +85,10 @@ foreach(_ss ${PCL_SUBSYSTEMS_MODULES})
 endforeach()
 
 #Boost modules
-set(PCLCONFIG_AVAILABLE_BOOST_MODULES "system filesystem iostreams")
+set(PCLCONFIG_AVAILABLE_BOOST_MODULES "system iostreams")
+if(Boost_FILESYSTEM_FOUND)
+  string(APPEND PCLCONFIG_AVAILABLE_BOOST_MODULES " filesystem")
+endif()
 if(Boost_SERIALIZATION_FOUND)
   string(APPEND PCLCONFIG_AVAILABLE_BOOST_MODULES " serialization")
 endif()
@@ -101,4 +104,4 @@ install(FILES
         "${PCL_BINARY_DIR}/PCLConfig.cmake"
         "${PCL_BINARY_DIR}/PCLConfigVersion.cmake"
         COMPONENT pclconfig
-        DESTINATION ${PCLCONFIG_INSTALL_DIR})
+        DESTINATION ${PCLCONFIG_INSTALL_DIR})

io/CMakeLists.txt

@@ -343,7 +343,10 @@ PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${c
 
 target_include_directories(${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
 
-target_link_libraries("${LIB_NAME}" Boost::boost Boost::filesystem Boost::iostreams pcl_common pcl_io_ply)
+target_link_libraries("${LIB_NAME}" Boost::boost Boost::iostreams pcl_common pcl_io_ply)
+if(TARGET Boost::filesystem)
+  target_link_libraries("${LIB_NAME}" Boost::filesystem)
+endif()
 
 if(VTK_FOUND)
   if(${VTK_VERSION} VERSION_GREATER_EQUAL 9.0)

outofcore/CMakeLists.txt

@@ -2,8 +2,14 @@ set(SUBSYS_NAME outofcore)
 set(SUBSYS_DESC "Point cloud outofcore library")
 set(SUBSYS_DEPS common io filters octree visualization)
 
-set(build TRUE)
-PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ON)
+if(NOT TARGET Boost::filesystem)
+  set(DEFAULT FALSE)
+  set(REASON "Boost filesystem is not available.")
+else()
+  set(DEFAULT TRUE)
+endif()
+
+PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ${DEFAULT} "${REASON}")
 PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS})
 
 PCL_ADD_DOC("${SUBSYS_NAME}")

recognition/CMakeLists.txt

@@ -2,8 +2,14 @@ set(SUBSYS_NAME recognition)
 set(SUBSYS_DESC "Point cloud recognition library")
 set(SUBSYS_DEPS common io search kdtree octree features filters registration sample_consensus ml)
 
-set(build TRUE)
-PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ON)
+if(${PCL_VERSION} VERSION_LESS "1.15.0" AND NOT TARGET Boost::filesystem)
+  set(DEFAULT FALSE)
+  set(REASON "Boost filesystem is not available.")
+else()
+  set(DEFAULT TRUE)
+endif()
+
+PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ${DEFAULT} "${REASON}")
 PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS})
 
 PCL_ADD_DOC("${SUBSYS_NAME}")